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

Rebase info

Adityarup Laha 2018-04-14 13:07:08 +05:30
parent 8963a98338
commit b9b12ab4bc
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Typical-Git-Workflow.md

@ -39,6 +39,8 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* From your branch, rebase `upstream/master`
* `git checkout new-branch-name`
* `git rebase -i upstream/master`
* Replace `pick` with `fixup` in all commits addressing feedback.
* Reword, reorder, resolve, if required.
* Update `origin/new-branch-name`
* `git push origin new-branch-name --force`
* Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master`