5 ms·
Git is amazing, I just wish if there was a better conflict resolving approach in Git.
by msoad 14y ago
Git is amazing, I just wish if there was a better conflict resolving approach in Git.
- alinajaf 14y agoDo you really? I like the fact that git doesn't try anything clever when it hits a conflict and asks you to fix by hand. Have you found an automatic conflict resolution tool that you liked before?
- _ikke_ 14y agoresolving conflicts is not something machines can do. There needs to be a human to decide what is a correct outcome.