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?