>So is it always valid to assume that the merge has already been resolved (in git) by the time Merge is called?

If the user want to rcheckin a merge commit, I take for granted that the merge was already resolved in git...