Resuming M-x gitmerge

[Noam Postavsky]

When M-x gitmerge hits a conflict, it shows a window with the message:

    Resolve the conflicts manually, then run gitmerge again.
    Note:
      - You don't have to add resolved files or commit the merge yourself (but 
you can).
      - You can safely close this Emacs session and do this in a new one.
      - When running gitmerge again, remember that you must do that from within 
the Emacs repo.

The first note is either wrong, or I'm misunderstanding it.  If I don't
'git add' the resolved files and commit the merge, then trying to run
M-x gitmerge again fails with (user-error "Repository is not clean").

So what is the intended workflow here?