News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by nothrabannosir on Monday December 12, 2016 @05:11PM (#13162447)
Great idea! Although this does break cherry-pick, doesn't it?
Re:Resolve simple merge conflicts on GitHub by btown on Monday December 12, 2016 @05:16PM (#13162492)
I'd imagine this also breaks bisect (and might make your CI system very confused), since you have a non-good commit.
Re:Resolve simple merge conflicts on GitHub by azernik on Monday December 12, 2016 @05:58PM (#13162853)
Bisect knows how to deal with this; you can tell it to ignore a commit that you know is broken for reasons unrelated to the issue upper investigating (and try adjacent ones instead).
Re:Resolve simple merge conflicts on GitHub by aargh_aargh on Monday December 12, 2016 @05:13PM (#13162465)
Why would it? You can get a conflict on a cherry-pick as well.
Re:Resolve simple merge conflicts on GitHub by nothrabannosir on Monday December 12, 2016 @07:54PM (#13163571)
I meant to write bisect---I was in the middle of an actual git workflow and accidentally wrote this instead. :)