Merge back from the upstream repository, or create the new pull request on a new branch.
Or rebase on top of upstream:
git remote add upstream (url-for-upstream-repository)
git fetch upstream
git rebase upstream/master
git push -f origin
(do new pull request on website)
与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…