News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by phpnode on Monday December 12, 2016 @06:45PM (#13163194)
Presumably in this model the dev wouldn't push their branch until the merge is actually complete, and there's presumably a convention like prepending `[CONFLICT]` to those commits to discourage people from checking them out directly.

There are no comments on this comment yet.