From f271e60e58c1ba26f092e9b3fbe6cb6e65dfa137 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 11 Feb 2023 19:29:39 -0500 Subject: [PATCH] Update release process --- doc/release-process.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/release-process.md b/doc/release-process.md index 03a174cd1..825b5192e 100644 --- a/doc/release-process.md +++ b/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.