mergetool

Learn to resolve conflicts visually with git mergetool.

What Is git mergetool?

git mergetool helps you resolve merge conflicts using a visual tool. You can inspect the contents side by side and decide which changes to keep.

git mergetool

A visual tool makes it easier to compare conflicting contents. The tool may need to be configured on your system.

Visual Comparison Tools

Visual merge tools can display the current branch's content, the incoming branch's content, and the merge result in separate sections. This lets you compare changes line by line and choose the appropriate result.

git mergetool

Git opens the configured tool if one is available. Applications such as Meld help you inspect different file contents side by side.

Exercise Prepare the Visual Tool Command

Assign git mergetool to a JavaScript variable named toolCommand. Then print the command.

Show example solution

const toolCommand = "git mergetool";

console.log(toolCommand);

Test yourself

What is the main purpose of using git mergetool?
- Delete all commits in the repository
- Inspect and resolve conflicts visually
- Create a new user account
- Automatically delete all branches
Show answer

Inspect and resolve conflicts visually — git mergetool makes it easier to resolve conflicts by comparing conflicting file contents in a visual interface.
Identify the Visual Comparison Tool
```
git ____ app.js
```
Show answer
```
git mergetool app.js
```
Visual Tool Concepts

git mergetool

Opens the visual merge tool
Visual

Inspection through an interface
Diff tool

Compares changes
Meld

Visual comparison application

Next lesson: Summary - Conflict resolution

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies