git checkout v2.1 && git fetch origin v2.1 && git rebase origin/v2.1 git rebase --abort to abort a ongoing rebase merge conflict thing