Hacker News new | ask | show | jobs
by msoad 4869 days ago
Git is amazing, I just wish if there was a better conflict resolving approach in Git.
2 comments
alinajaf 4869 days ago
Do 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?
link
_ikke_ 4869 days ago
resolving conflicts is not something machines can do. There needs to be a human to decide what is a correct outcome.
link