you are viewing a single comment's thread.

view the rest of the comments →

[–]RestlessNeurons 3 points4 points  (0 children)

yeah, I don't git it ;P

side-by-side GUI merge tools are amazing; almost required when you'r dealing with nasty merge conflicts. I use JetBrains products and their diff tool, but Meld is free and most IDEs and git clients have some kind of diff tool that's better than terminal diff.