Please document my options w.r.t. merge resolution

[dabrahams]

For example, after I resolve a merge conflict, if I run tests and find I need to make corrections, can I add new commits before git imerge continueing or must I amend the last commit?

[mhagger]

You must amend the last commit. git imerge continue and git imerge record only recognize a manual merge based on its having direct parents that are diagonally adjacent in the merge graph (and I think the "hole" has to already be listed as a "blocker" in the imerge state). I'm not sure how much code would have to change to relax this restriction (probably not all that much), but without a way to preserve the split commit in the final simplification, it wouldn't really buy you much as far as I can tell.