News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by masklinn on Tuesday December 13, 2016 @04:10AM (#13165553)
> test function return "good" whenever it sees a commit with merge conflicts

That's a terrible idea and would completely break bisect. You should signal "skip" (return code 125) if the commit can not be tested at all.

There are no comments on this comment yet.