Update deployment checklist

setvisible · Feb 17, 2018 · b0c3b22 · b0c3b22
1 parent 70ef580
commit b0c3b22
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHECKLIST-RELEASE.md b/CHECKLIST-RELEASE.md
@@ -10,10 +10,17 @@
 
 ### Pre-Building
 
+ - Check local branches with `git branch` and remote branches with `git branch -r`
+ - Merge (without fast-forward) with `git merge --no-ff feature#33-something` (or rebase with `git rebase feature#33-something`)
+ - Delete merged branches with `git branch -d feature#46-old-branch`
  - Change numbers in `version`
  - List the changes with `git log --pretty=oneline` and added them to `CHANGELOG`
  - Make sure `CHANGELOG` has a proper date set
  - Commit (use **Git GUI**)
+ - Check unstaged modifications with `git status`
+ - Check tags with `git tag`
+ - Checkout master branch `git checkout master`
+ - Merge (without fast-forward) branch develop with `git merge --no-ff develop`
  - Tag the commit with a new version number: `git tag -a vXXX -m "FastenerPattern version XXX"` where XXX is the version
  - Push with `git push origin vXXX`
  - Verify with `git show vXXX`