5 How to keep a pull request up to date

Unknown W. Brackets edited this page 2013-09-01 16:19:38 -07:00

Do some work on a branch. When it's done, you'll probably find that you've fallen behind the main code base. Here's how to get it up to date:

git remote add upstream https://github.com/hrydgard/ppsspp.git   (if you haven't already)
git fetch upstream
git rebase upstream/master 
git submodule update

(fix any conflicts)

git push -f

If you don't have a pull request, make one now. If you had one already, the git push will update it.