Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > I don't follow this at all - where is the existing check that > CHERRY_PICK_HEAD does not exist when "git cherry-pick --no-commit" > stops for conflicts? There is none. That was my error: the guard in do_pick_commit() is shared, but the suite only exercises the clean pick. v3 adds test_ref_missing CHERRY_PICK_HEAD to the conflicting advice test, the helper you pointed at.