Skip to content

Commit

Permalink
docs: add staging to release steps
Browse files Browse the repository at this point in the history
  • Loading branch information
corneliusroemer authored Dec 17, 2021
1 parent b1532c3 commit 09629c7
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,23 @@ Terminal commands for the "merge master branch to staging branch using fast-forw
git pull --all
# Switch to release branch
git checkout release
git checkout staging
# Fast-forward release branch to master locally
git merge master release --ff-only
git merge master staging --ff-only
# Push release branch to the remote server
git push origin staging
git checkout release
git merge master release --ff-only
git push origin release
# Switch away from the release branch to avoid accidental commits later
git checkout master
```
It is often helpful to visualize the correctness of the branch state on every step by using a GUI git client, such as GitKraken, SourceTree, and [others](https://git-scm.com/downloads/guis).
Expand Down

0 comments on commit 09629c7

Please sign in to comment.