Cherry-pick lab

Copy one commit onto another branch — clean picks vs conflict cases — then continue or abort.