4 ms·
I hope someone solves the merge conflict problem once and for all. Each time there’s a merge conflict the project stops for days as no one knows how to resolve
by pkrumins 5y ago
I hope someone solves the merge conflict problem once and for all. Each time there’s a merge conflict the project stops for days as no one knows how to resolve them. In the end the solution always is to delete the git repository and clone it again.
- loh 5y agoI'm confused by your comment. What kind of merge conflicts stop a project for days? And why would the solution to a merge conflict be to delete the repository and clone it again? Or are you being sarcastic?
- pkrumins 5y agoAll 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!