CHAPTER 06
Using Git Tools for Conflict Resolution
Updated: May 15, 2026
20 min read
# CHAPTER 6
Using Git Tools for Conflict Resolution
1. Introduction
While deleting conflict markers manually in a raw text editor builds foundational knowledge, it is an archaic practice in modern software engineering. If you are merging 15 files with 50 conflicts each, manual deletion will take hours and inevitably lead to human error. Modern developers use graphical interface tools. In this chapter, we will graduate from manual text editing to utilizing the built-ingit mergetool command, explore dedicated GUI merge tools, and master the incredibly powerful Merge Editor integrated directly into VS Code.
2. Learning Objectives
By the end of this chapter, you will be able to:- Configure Git to use a graphical merge tool.
-
Launch the
git mergetoolcommand.
- Understand the 3-panel and 4-panel split view interfaces.
- Utilize the VS Code Merge Editor to resolve conflicts with a single click.
-
Automate the cleanup of
.origbackup files.
3. Beginner Explanation
Imagine editing a movie script again.- The Manual Way (Ch 5): You have a single piece of paper with confusing notes scribbled all over it. You have to carefully erase the bad parts without accidentally tearing the paper.
- The GUI Tool Way (Ch 6): You have three massive computer monitors on your desk.
- Monitor 1 shows Writer A's script in green.
- Monitor 2 shows Writer B's script in blue.
- Monitor 3 shows the final master copy.
4. The git mergetool Command
Git has a built-in command that automatically searches your computer for installed visual merge tools (like KDiff3, Meld, or P4Merge) and opens them.
When you hit a conflict, simply type:
bash
Git will pause the terminal and launch a separate application.
The Interface (3-Way Split): Most merge tools open three distinct windows on your screen:
- 1. LOCAL (Left): The file as it exists on the branch you are standing on.
- 2. REMOTE (Right): The incoming file from the feature branch.
- 3. BASE (Center/Bottom): The final file where you are making the actual edits.
You use the GUI buttons to select "Keep Left" or "Keep Right", save the file, and close the application. Git will automatically run git add for you!
5. The VS Code Merge Editor
VS Code has become the industry standard editor, largely because of its incredible, built-in Git conflict resolution interface.When you open a conflicted file in VS Code, you do not see the ugly <<<<<<< markers. VS Code automatically hides them.
Instead, it highlights the conflicting blocks in vibrant colors (Current Change in Green, Incoming Change in Blue).
Above the colored blocks, VS Code provides hyperlinked, clickable buttons:
-
Accept Current Change
-
Accept Incoming Change
-
Accept Both Changes
-
Compare Changes
6. Mini Project: Resolve Conflicts using VS Code
Let's simulate a rapid resolution workflow using VS Code.Step-by-Step Walkthrough:
- 1. Generate a conflict in your local repository.
- 2. Open the repository in VS Code.
- 3. On the left-hand sidebar, click the Source Control icon (the Git icon).
- 4. Under "Merge Changes", click on the conflicted file (it will have an orange 'C' next to it).
- 5. The file opens in the main window. Observe the beautiful color-coded blocks.
- 6. Simply click the blue text link that says Accept Incoming Change.
- 7. *The Magic:* The green block disappears, the blue block remains, and all the invisible Git markers are instantly deleted perfectly.
-
8.
Save the file (
Ctrl+S).
-
9.
Go back to the Source Control sidebar. Click the
+icon next to the file to stage it.
- 10. Click the Commit button to finalize the merge.
You just resolved a conflict in 3 clicks without typing a single character.
7. Cleaning up Backup Files (.orig)
When you use a graphical tool via git mergetool, Git is paranoid. Before it lets the tool change your file, it creates a backup copy named filename.txt.orig.
After you successfully resolve the conflict, this ugly .orig file is left sitting in your folder.
You can tell Git to automatically delete these backups upon a successful merge:
bash
8. Best Practices
- Configure Your Default Tool: Do not rely on Git to guess which tool to open. Explicitly tell Git that you want to use VS Code as your default merge tool.
bash
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'
`
Now, when you type git mergetool, VS Code will open automatically.
9. Common Mistakes
-
Closing the Tool Without Saving: A common mistake when using external GUI tools is making all the correct selections, but then closing the window (hitting the 'X') before actually clicking "Save" in the tool's interface. The tool closes, but the conflict remains unresolved in the terminal. Always save the file inside the GUI before exiting.
10. Exercises
-
1.
What are the three distinct panels (LOCAL, REMOTE, BASE) shown in a standard visual merge tool?
-
2.
Explain how the VS Code visual interface prevents the human error of accidentally leaving a
<<<<<<< marker in the code.
11. FAQs
Q: Do I have to pay for a good merge tool?
A: No. While some premium tools exist (like Beyond Compare), the absolute best tools are free. VS Code's built-in editor, Meld (Linux), and KDiff3 (Windows) are free, open-source, and used by professionals globally.
12. Summary
In Chapter 6, we modernized our workflow. We discarded manual text editing in favor of highly visual, automated graphical interfaces. By utilizing git mergetool and configuring our environment to leverage IDEs like VS Code, we transformed conflict resolution from a tedious, error-prone manual chore into a rapid, point-and-click operation. We learned to interpret multi-panel views and automated the cleanup of residual backup files, drastically increasing our efficiency during complex integrations.
13. Next Chapter Recommendation
We know how to resolve conflicts during a standard git merge`. But merging is not the only way to combine code. What happens when conflicts arise during a Rebase? Proceed to Chapter 7: Rebasing and Conflict Resolution.