Skip to content

Instantly share code, notes, and snippets.

@ayamflow

ayamflow/Git team workflow - merge + rebase

Last active August 29, 2015 14:10
Show Gist options
  • Save ayamflow/e0ed27c916c05f2438bf to your computer and use it in GitHub Desktop.
Save ayamflow/e0ed27c916c05f2438bf to your computer and use it in GitHub Desktop.
Download ZIP
Git team workflow - merge + rebase
Raw
Git team workflow - merge + rebase
Git team workflow - merging and rebasing
0. git checkout [branch]
1. git push origin [branch]
2. git checkout master
3. git pull --rebase
4. git checkout [branch]
5. git rebase master
(6.) git mergetool / git rebase --continue
7. git checkout master
8. git merge --no-ff [branch]
9. git branch -d [branch]
10. git push origin :[branch]
11. git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment