News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by robinson7d on Monday December 12, 2016 @07:58PM (#13163604)
I don't think that would work, but correct me if I'm wrong.

As far as I know, git bisect does a binary search along the commits; `good` tells it to look at the latter half, `bad` to look at the former.

So suppose you have five commits (1,2,3,4,5), where 1 is the working state, and 3 is a conflict commit. It will start by asking about the middle commit (3), automatically choose `good`, and determine that 3 was the latest working commit (after checking 4, which says `bad`).

----

EDIT: Obviously this is simplified to explain the issue with marking "good" those commits.

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.