News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by michaelmior on Monday December 12, 2016 @10:48PM (#13164273)
This is resolved if you skip the commits with a conflict instead of marking as good.

There are no comments on this comment yet.