- Code: Select all • Expand view
git pull gzdoom master --rebase
// ... fix any merge conflicts as needed, make sure to continue the merge if it stops ...
git push yourremote branchname -f
This cleans up the pull request, as well as your git history, and generates a tidy display on the pull request screen when a reviewer/developer comes to look at it. Do be careful how you type things, and obviously do not use this on a branch that is intended for downstream for forks or other contributors.
The first command asks Git to checkout GZDoom's current master, directly, and then it rewinds your work and "fast-forwards" your work on top of it, essentially cherry-picking your past deeds and replaying them.
The second command asks Github to accept these changes as-is, because with your local branch missing its 'HEAD' it will reject them unless you force the push. (Again, I emphasize, be careful with that, and don't use it on collab/downstream branches)