On: Take the pain out of Git conflict resolution: use ...

[ZeroGravitas]

You can set a flag in git so it won't start a merge if it can't finish it with a simple fast forward. This avoids this situation.

git pull --rebase can be used to get local changes on top of new remote work.

But just deleting (or renaming the branch) and checking out again is all that is necessary if you end up in a messed up merge.

[pkrumins → ZeroGravitas]

Thanks!