Starts your configured merge tool on each file with unresolved conflicts, one after another. Configure the tool with git config merge.tool. After resolving a file it asks whether the resolution is correct before moving on.
Looking for more? Search all 7,657 commands — works offline, in English or Spanish, and fixes typos.