Skip to content

Instantly share code, notes, and snippets.

@gismo141

gismo141/merge_delete_branch_bp

Created May 13, 2015 07:24
Show Gist options
  • Save gismo141/8e93443d99407b0c5561 to your computer and use it in GitHub Desktop.
Save gismo141/8e93443d99407b0c5561 to your computer and use it in GitHub Desktop.
Download ZIP
git merge/delete branch (best-practice)
Raw
merge_delete_branch_bp
git checkout <feature-branch>
git pull
git checkout <release-branch>
git pull
git merge --no-ff <feature-branch>
git push
git tag -a branch-<feature-branch> -m "Merge <feature-branch> into <release-branch>"
git push --tags
git branch -d <feature-branch>
git push origin :<feature-branch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment