Run merge conflict resolution tools to resolve merge conflicts.
More information.
- Launch the default merge tool to resolve conflicts:
git mergetool --tool-help
- Launch the merge tool identified by a name:
git mergetool --tool {tool_name}
- Don't prompt before each invocation of the merge tool:
git mergetool --no-prompt
- Explicitly use the GUI merge tool (see the `merge.guitool` config variable):
- Explicitly use the regular merge tool (see the `merge.tool` config variable):
Copyright © 2014—present the tldr-pages team and contributors.
This work is licensed under the Creative Commons Attribution 4.0 International License (CC-BY).
CC-BY