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

A bit of additional info regarding rebase.

Adityarup Laha 2018-04-14 13:03:59 +05:30
parent de09192292
commit 8963a98338
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Typical-Git-Workflow.md

@ -49,11 +49,14 @@ It's appreciated if every single commit in a branch on its own compiles on all s
**Once your pull request is ready to be merged...** **Once your pull request is ready to be merged...**
* From your branch, interactive rebase to squash all of the new commits (as a result of the pull request feedback) into the commits that they were addressing * From your branch, interactive rebase to squash all of the new commits (as a result of the pull request feedback) into the commits that they were addressing
* `git checkout new-branch-name` * `git checkout new-branch-name`
* `git rebase -i HEAD~n`
* 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`
* Now, you should see a file containing all the commits on this branch.
* For all commits that address feedback, replace `pick` with `fixup`. Re order if required (beware, you might get conflicts at this stage! Resolve them carefully, then use `git rebase --continue`)
* You can also change commit messages by replacing `pick` with `reword`.
* Then follow the steps as directed by Git (These are not specific to Citra, so you shouldn't have a problem if you use Git regularly.)
* Rebase complete!
* 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/) or @ #citra-general on [Discord](https://citra-emu.org/discord/). Mastering Git is not as easy as it might sound, but we'll happily help you get started.