tool for solving "trivial conflicts" in git

Question

Hi,

Do you know any tool/switch for git commands which help me prevent conflicts or speed up merges?

Currently I often got "trivial conflicts" such this:

++<<<<<<< HEAD
++=======
+ onClick
+ onWakeup
++>>>>>>> 587f917... 

I suppose that that is caused by some white-spaces.. this is very easy to solve by human, however it requires a lot of time to resolve all such conflicts.

Is there any tool which can solve this type of conflicts automatically?

Answer 1

Run git-mergetool to resolve merge conflicts. See the man page here. Git has several options for merge tools. I prefer kdiff3. It's open-source, cross-platform, and easy to learn.

Git resolves as many conflicts as it can. If you get that message, it means git found a conflict that requires human intervention to resolve.

Answer 2

If you find yourself resolving the same conflicts again, and again, then you probably want to use git rerere.