Update release documentation

This commit is contained in:
Gunnar Beutner 2015-10-22 13:41:31 +02:00
parent e8762a0404
commit 65a9ee0dbb
1 changed files with 3 additions and 1 deletions

View File

@ -65,11 +65,13 @@ For major releases: Create a new "support" branch:
$ git checkout -b support/2.3
$ git push -u origin support/2.3
For minor releases: Push the support branch and cherry-pick the release commit into master:
For minor releases: Push the support branch, cherry-pick the release commit
into master and merge the support branch:
$ git push -u origin support/2.3
$ git checkout master
$ git cherry-pick support/2.3
$ git merge --strategy=ours support/2.3
$ git push origin master
# External Dependencies