OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 14:11:05 +00:00
Code Issues Projects Releases Wiki Activity

Updated Typical Git Workflow (markdown)

archshift 2015-03-08 23:36:46 -07:00
parent 98ef2cc76c
commit a128848a6c
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

@ -28,7 +28,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* 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 from `upstream/master`, 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 from `upstream/master`, and then committed all of your new stuff.
* `git rebase -i upstream/master` * `git rebase upstream/master`
**Scenario B: You did some more work in your branch... Then, someone committed something to `upstream/master` that will cause conflicts when trying to get the branch merged back to upstream/master!** **Scenario B: You did some more work in your branch... Then, someone committed something to `upstream/master` that will cause conflicts when trying to get the branch merged back to upstream/master!**
* From your branch, rebase `upstream/master` * From your branch, rebase `upstream/master`