Completes a conflicted merge once you have fixed the files and staged them, reusing the prepared merge message. It is the merge counterpart of git rebase --continue. Resolve all conflicts and git add the files before running it.
Looking for more? Search all 7,657 commands — works offline, in English or Spanish, and fixes typos.