git mergetool / difftool

SafeResolve with external tools

git mergetool

Hands conflicts/diffs to your GUI tool of choice (e.g. VS Code) — configure merge.tool once, resolve visually.

Examples

git config --global merge.tool vscode && git mergetoolResolve conflicts in VS Code

Syntax

git mergetool [--tool=name] / git difftool

Before you run it

Launches the tool only.

Related commands

git mergeMerge
git diffShow diff
git configConfiguration

The same reference, with no signal at all

Every command on this site, held on your device. The app adds 632 more: 1,510 commands and 120 fix flows, searchable with no connection. Free to install, no ads (some content is a one-time purchase).

Get it free on the App Store