Skip to content

Instantly share code, notes, and snippets.

@NTruchaud
Created February 5, 2018 13:46
Show Gist options
  • Save NTruchaud/920770e7fa170673f716840369c1f7e8 to your computer and use it in GitHub Desktop.
Save NTruchaud/920770e7fa170673f716840369c1f7e8 to your computer and use it in GitHub Desktop.
git flow feature start feature_branch
git checkout master
git merge hotfix_branch
git checkout develop
git merge hotfix_branch
git branch -D hotfix_branch
git flow hotfix finish hotfix_branch
git checkout develop
git merge feature_branch
git flow feature finish feature_branch
git checkout develop
git checkout -b release/0.1.0
git flow release start 0.1.0
git checkout develop
git merge release/0.1.0
git checkout master
git checkout merge release/0.1.0
git flow release finish '0.1.0'
git checkout master
git checkout -b hotfix_branch
git flow hotfix start hotfix_branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment