Run merge conflict resolution tools to resolve merge conflicts.

# To launch the default merge tool to resolve conflicts:
git mergetool

# To list valid merge tools:
git mergetool --tool-help

# To launch the merge tool identified by a name:
git mergetool --tool <tool_name>

# To don't prompt before each invocation of the merge tool:
git mergetool --no-prompt

# To explicitly use the GUI merge tool (see the 'merge.guitool' config variable):
git mergetool --gui

# To explicitly use the regular merge tool (see the 'merge.tool' config variable):
git mergetool --no-gui