My pull request is being rejected because my master branch is out of sync. How do I get it in sync?

Question

I'm sending in a pull request but the repo owner is rejecting it because my master is out of sync. I'm not sure how to bring it into sync.

I did a git pull to merge the original repo and my forked repo. Then I fixed any merge conflicts.

git pull upstream master

Not sure if this is fully accurate. Just need to know if there is anything else I need to be doing.

Answer 1

Ideally, your pull request is done from a dedicated branch, not from master .

That means all you need to do is:

 git fetch upstream
 git checkout my_PR_branch
 git rebase upstream/master
 git push --force

If you want, you can also reset your local master branch to upstream/master (assuming again that you have developpped your PR in its own branch)