Expand description
mkit cherry-pick <commit> | --continue | --abort — replay a single
commit onto HEAD, with a resolvable-conflict workflow (#177).
On a clean merge we create a new commit on the current branch using
the original commit’s message. On conflict we materialise the
conflict material into the worktree + index, persist
CHERRY_PICK_HEAD/CHERRY_PICK_MSG/ORIG_HEAD and the
mkit-conflicts sidecar, and exit non-zero. The user resolves,
mkit adds, then runs mkit cherry-pick --continue.
--continue refuses unless CHERRY_PICK_HEAD exists and no
marker-bearing file remains; it builds the final tree from the
resolved index. --abort restores HEAD/ref/index/worktree to
ORIG_HEAD.