News for hackers. Stuff that matters.
Re:Git Is Simpler Than You Think by jrockway on Wednesday September 07, 2011 @05:38PM (#2971584)
This line is irrelevant debugging information. The problem is that there's a merge conflict. This would happen with any version control system; it's not something unique to Git.

There are no comments on this comment yet.