N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated Typical Git Workflow (markdown)

bunnei 2014-06-13 09:40:31 -07:00
parent fd83c0dbf2
commit 1864dbbf0d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Typical-Git-Workflow.md

@ -18,7 +18,7 @@
* Push your new branch to origin if you'd like * Push your new branch to origin if you'd like
* `git push origin new-branch-name` * `git push origin new-branch-name`
**Scenario A: You did some work in your branch… Then, someone committed something to master that you want!** **Scenario A: You did some work in your branch... Then, someone committed something to `upstream/master` that you want!**
* Make sure you're on your branch * Make sure you're on your branch
* `git checkout new-branch-name` * `git checkout new-branch-name`
* Rebase upstream/master onto it. With the rebase, move all of your changes to the top, and put all of the new master changes immediately after where you branched from. The goal should be that the branch now appears as though you just created it, and then committed all of your new stuff. * Rebase upstream/master onto it. With the rebase, move all of your changes to the top, and put all of the new master changes immediately after where you branched from. The goal should be that the branch now appears as though you just created it, and then committed all of your new stuff.