Skip to content

Instantly share code, notes, and snippets.

@SmellyFish
Created September 24, 2014 19:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save SmellyFish/0aee8256466efc64e021 to your computer and use it in GitHub Desktop.
Save SmellyFish/0aee8256466efc64e021 to your computer and use it in GitHub Desktop.
CoreCommerce: prepping release branch
# 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