git pull --rebase upstream & git push origin rejects non-fast-forward?

Question

I\'ve implemented classic OSS maintainer/contributor git workflow for a company project on github, however one edge case produces some weird results that I\'m not sure how t

Answer 1

When you

git pull --rebase upstream master

you are rewriting your own history, since you are rebasing your master branch on the updated upstream repository. When you push your rebased repo to your fork git complains. You need to push with --force

git push --force origin master