News for hackers. Stuff that matters.
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. :)