News for hackers. Stuff that matters.
Re:Git: Bram Cohen vs Linus Torvalds by lacker on Saturday March 07, 2009 @12:21PM (#506578)
I completely agree but you are not extreme enough - I would rather have 100 trivial manual merge resolutions than 1 bad automated merge. You might not even notice your bad automated merge and that gets to be serious badness.

There are no comments on this comment yet.