News for hackers. Stuff that matters.
Re:Git Is Simpler Than You Think by VilleSalonen on Wednesday September 07, 2011 @03:21PM (#2970981)
I read through the article waiting for the explanation of the "Falling back to patching base and 3-way merge?" line but unfortunately it wasn't explained. Git didn't become any simpler after all. :(
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.