Comment by DangitBobby

2 days ago

You should also be able to do

  git branch -f master origin/master

This doesn't work if your local master was already ahead of origin

  • Indeed, as with all of these examples exceptions will apply and, it's a good idea to check the log before taking any such action. I believe your example also depends on exactly how many commits you've made that need to be moved. In any case, it depends on me remembering exactly what `~` signifies.