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?

resolving conflicts is not something machines can do. There needs to be a human to decide what is a correct outcome.