Commit b887adf06ee347aac91ba41c510b8e65acbcefdc
Expand build.sh: merge content to master, not code
* Commit all updates in content/ to the content branch. * Merge the content branch into master. * Merge master into the content and develop branches. Do not merge develop into master. This should be done manually, to prevent accidentally publishing unfinished changes.Greg K Nicholson committed on 2/24/2018, 7:43:52 PM
Parent: b11df5af2a5f37490c79adb7b59892579870e3a8
Files changed
| build.sh | changed |
| build.sh | ||
|---|---|---|
| @@ -1,6 +1,17 @@ | ||
| 1 | 1 … | ./develop_server.sh stop && \ |
| 2 … | + git checkout content && \ | |
| 3 … | + if [[ "$(git diff content/)" ]] | |
| 4 … | + then | |
| 5 … | + git add content/ | |
| 6 … | + git commit -m "Update content $(date +%F\ %X)" | |
| 7 … | + fi && \ | |
| 2 | 8 … | git checkout master && \ |
| 3 | - git merge develop && \ | |
| 9 … | + git merge content && \ | |
| 10 … | + git checkout content && \ | |
| 11 … | + git merge master && \ | |
| 12 … | + git checkout develop && \ | |
| 13 … | + git merge master && \ | |
| 14 … | + git checkout master && \ | |
| 4 | 15 … | git push && \ |
| 5 | 16 … | pelican && \ |
| 6 | 17 … | git checkout develop |
Built with git-ssb-web