Commit c0a161295a9ae9579fb2e5393a348c3b75f882ca
build.sh: switch back to merges instead of rebases
master should not diverge from ssb/masterGreg K Nicholson committed on 2/25/2018, 11:32:50 PM
Parent: 9eb6ce65d134137a04464ae64c144236be1fd2b3
Files changed
| build.sh | changed |
| build.sh | |||
|---|---|---|---|
| @@ -4,11 +4,17 @@ | |||
| 4 | 4 … | then | |
| 5 | 5 … | git add content/ | |
| 6 | 6 … | git commit -m "Update content $(date +%F\ %X)" | |
| 7 | 7 … | fi && \ | |
| 8 | - git rebase master content && \ | ||
| 9 | - git rebase content master && \ | ||
| 10 | - git rebase master develop && \ | ||
| 11 | 8 … | git checkout master && \ | |
| 9 … | + git merge content && \ | ||
| 10 … | + git merge --ff-only content && \ | ||
| 11 … | + git checkout content && \ | ||
| 12 … | + git merge master && \ | ||
| 13 … | + git merge --ff-only master && \ | ||
| 14 … | + git checkout develop && \ | ||
| 15 … | + git merge master && \ | ||
| 16 … | + git merge --ff-only master && \ | ||
| 17 … | + git checkout master && \ | ||
| 12 | 18 … | git push && \ | |
| 13 | 19 … | pelican && \ | |
| 14 | 20 … | git checkout develop | |
Built with git-ssb-web