DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update release process

Browse Source
This commit is contained in:
Duke
2023-02-11 19:29:39 -05:00
parent 4a2361cdf6
commit f271e60e58
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/release-process.md
View File

@@ -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: 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 checkout dev
git merge --no-ff master # using the default commit message is fine git push origin dev
git push
``` ```
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. 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.