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.
Re:Resolve simple merge conflicts on GitHub
by sethammons on Monday December 12, 2016 @07:08PM
(#13163332)
And you just lost git bisect
Re:Resolve simple merge conflicts on GitHub
by paulddraper on Monday December 12, 2016 @07:59PM
(#13163609)
Not really; git bisect skip still works.
I agree I don't like it either.
Re:Resolve simple merge conflicts on GitHub
by pkamb on Monday December 12, 2016 @08:01PM
(#13163621)
`git bisect skip`
Re:Resolve simple merge conflicts on GitHub
by sethammons on Tuesday December 13, 2016 @11:14AM
(#13167858)
The more you know; I'll have to look into that!
Re:Resolve simple merge conflicts on GitHub
by jzwinck on Monday December 12, 2016 @07:34PM
(#13163457)
You can get it back by making your bisect test function return "good" whenever it sees a commit with merge conflicts.
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.
Re:Resolve simple merge conflicts on GitHub
by dantiberian on Monday December 12, 2016 @08:01PM
(#13163624)
I think you'd want to skip, not mark as good?
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.
On the other hand, with your approach you are going to have revisions that won't even build/compile.
If you have automatic builds or/and unit/integration tests, then you'll have failed builds every time you have a merge conflict.
Also, you are kind of 'polluting a well': what if meanwhile someone merges that revision into his/her branch? Or what if you have automatic merges configured?