OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-27 07:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Updated Typical Git Workflow (markdown)

bunnei 2014-06-16 20:45:56 -07:00
parent b3f323d92b
commit a6a1acbf1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Typical-Git-Workflow.md

@ -38,7 +38,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* `git checkout new-branch-name` * `git checkout new-branch-name`
* `git rebase -i upstream/master` * `git rebase -i upstream/master`
* Update `origin/new-branch-name` * Update `origin/new-branch-name`
* `git push origin/new-branch-name --force` * `git push origin new-branch-name --force`
* Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master` * Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master`
**Gracefully receive feedback from the team** **Gracefully receive feedback from the team**
@ -51,7 +51,7 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* Rebase `upstream/master` onto your branch to ensure that you have any changes made since your pull request was created * Rebase `upstream/master` onto your branch to ensure that you have any changes made since your pull request was created
* `git rebase -i upstream/master` * `git rebase -i upstream/master`
* Update `origin/new-branch-name` * Update `origin/new-branch-name`
* `git push origin/new-branch-name --force` * `git push origin new-branch-name --force`
* Merge your branch in * Merge your branch in
* Always merge using the >merge< button in the GitHub pull request * Always merge using the >merge< button in the GitHub pull request
* If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #citra on [freenode](http://webchat.freenode.net/). Mastering Git is not as easy as it might sound, but we'll happily help you get started. * If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #citra on [freenode](http://webchat.freenode.net/). Mastering Git is not as easy as it might sound, but we'll happily help you get started.