News for hackers. Stuff that matters.
Re:Setting up Sublime Text 2 by forrestthewoods on Tuesday April 09, 2013 @07:31PM (#5522190)
Araxis Merge, problem solved?
Re:Setting up Sublime Text 2 by lobster_johnson on Tuesday April 09, 2013 @07:34PM (#5522206)
I don't know it. But unless it's something that comes built into Git it's not useful. It needs to be something everyone has. That's the whole point.
Re:Setting up Sublime Text 2 by forrestthewoods on Tuesday April 09, 2013 @08:08PM (#5522349)
Nah. Use araxis merge and all your issues go away forever. If other devs want to use shitty tools then that's their fault. If you have a repo and are trying to merge pull requests then you definitely should stop using shitty tools. Even if you don't trim whitespace you should have non-shitty tools for local usage.

There's no reason to use shitty tools here.