Home Blog CV Projects Patterns Notes Book Colophon Search

Resolve

Pull request in repo from fork:myfeature to upstream:master

git clone https://github.com/fork/repo.git resolve
cd resolve
git remote add upstream https://github.com/upstream/repo.git
# Can add a pushurl = nopush to prevent accidents
git fetch upstream
git checkout myfeature
git rebase upstream/master
# Resolve the problem
# e.g. vim package.json
git add package.json
git rebase --continue
# Check it is OK
git log
# Should fail
git push origin myfeature
# Force push
git push -f origin myfeature