3 ms·
All merge conflicts. You can never resolve them as everything is screwed. Takes days to figure it out. You usually just delete the repo and start all over again
by pkrumins 5y ago
All merge conflicts. You can never resolve them as everything is screwed. Takes days to figure it out. You usually just delete the repo and start all over again from a working commit.
- ZeroGravitas 5y agoYou 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 5y agoThanks!