git fetch upstream git rebase upstream/master fix conflicts: git checkout --theirs # keep my fork git checkout --ours # keep upstream/master manually resolve with editor cargo build git add git rebase --continue