Created
September 24, 2014 19:46
-
-
Save SmellyFish/0aee8256466efc64e021 to your computer and use it in GitHub Desktop.
CoreCommerce: prepping release branch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Make sure local master is up to date | |
$ git checkout master | |
$ git fetch origin | |
$ git merge origin/master | |
# Fix conflicts, commit and push | |
# Make sure local development is up to date | |
$ git checkout development | |
$ git merge origin/development | |
# Fix conflicts, commit and push | |
# Merge master into development | |
$ git merge master | |
# Fix conflicts, commit and push | |
# Create the new branch. 9.2.50 below should be replaced with the actual release version | |
$ git checkout -b release/9.2.50 | |
$ git push origin release/9.2.50 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment