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