Browse Source

Update release process

master
Duke 1 year ago
parent
commit
f271e60e58
  1. 6
      doc/release-process.md

6
doc/release-process.md

@ -24,9 +24,11 @@ git diff dev...master # look at the set of changes which exist in master but no
If the last command has no output, congrats, there is nothing to do. If the last command has output, then you should merge master into dev:
```
git checkout master
git merge --no-ff dev # using the default commit message is fine
git push origin master
git checkout dev
git merge --no-ff master # using the default commit message is fine
git push
git push origin dev
```
The `--no-ff` flag above makes sure to make a merge commit, no matter what, even if a "fast forward" could be done. For those in the future looking back, it's much better to see evidence of when branches were merged.

Loading…
Cancel
Save