Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > If the user commits a conflict resolution using 'git commit' during a > sequence of picks then 'git status' missed the fact that a > cherry-pick/revert is still in progress. How well would this play with the previous step? Didn't the change to builtin/commit.c made in [1/2] mean that after 'git commit' that concludes the last step, there is nothing 'git status' to notice?