[nothrabannosir]

Great idea! Although this does break cherry-pick, doesn't it?

[btown]

I'd imagine this also breaks bisect (and might make your CI system very confused), since you have a non-good commit.

[azernik]

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).

[aargh_aargh]

Why would it? You can get a conflict on a cherry-pick as well.

[nothrabannosir]

I meant to write bisect---I was in the middle of an actual git workflow and accidentally wrote this instead. :)