Resolving Merge Conflicts in GitKraken’s Visual Editor: A Practical Guide

Problem & Quick Takeaway

When two developers edit the same line of code, Git reports a merge conflict. Traditionally you’d drop to the command line and edit the markers yourself. GitKraken eliminates that step with a built‑in visual Conflict Editor that lets you see the BASE, LOCAL, and REMOTE versions side‑by‑side, pick or edit chunks, and then Mark as Resolved to stage the file. The key takeaway: open the Conflict Editor, resolve the file, click Mark as Resolved, and finish the merge.

How the Visual Conflict Editor Works

When a merge or rebase produces a conflict, GitKraken flags the affected file with a red conflict icon. Clicking the file opens the Conflict Editor pane. The pane is split into three columns:

• BASE – the common ancestor of the two branches.
• LOCAL – the version from the current branch.
• REMOTE – the version from the branch you’re merging in.
• Result – the area where you build the final file.

You can:

• Click a chunk in any of the three columns to copy it into the Result pane.
• Edit the Result pane directly to stitch together a custom resolution.
• Use the toolbar buttons to keep the current side, keep the other side, or keep all changes.

Once the Result pane looks correct, press Mark as Resolved. GitKraken stages the file automatically, and the conflict icon disappears. The merge can then be committed.

Step‑by‑Step Example

Below is a reproducible scenario that demonstrates the workflow. Run these commands in a terminal outside of GitKraken; the GUI will react to the repository state.

# Create a test repo
mkdir ~/gitkraken-conflict-demo
cd ~/gitkraken-conflict-demo

git init

echo "Line 1" > file.txt
git add file.txt
git commit -m "Initial commit"

# Create a feature branch and modify the file
git checkout -b feature

echo "Feature change" >> file.txt
git commit -am "Add feature change"

# Switch back to main and modify the same line
git checkout main

echo "Main change" >> file.txt
git commit -am "Add main change"

# Attempt to merge feature into main
git merge feature
# At this point Git reports a conflict in file.txt

Open GitKraken, add the local repository, and you’ll see file.txt highlighted with a red conflict icon. Click it to open the Conflict Editor. You’ll see the three panes with the overlapping changes. Resolve by selecting the desired chunks or editing the Result pane. Once satisfied, click Mark as Resolved. The icon will vanish, the file will be staged, and you can finish the merge by creating a merge commit.

What Happens Under the Hood?

When you click Mark as Resolved, GitKraken writes the Result pane content to the working tree, stages the file with git add, and updates the merge state. The merge commit is then created either automatically (if you enable auto‑commit) or manually via the Commit Merge button.

Common Pitfalls & Limits

• Missing the "Mark as Resolved" step – Closing the Conflict Editor without clicking the button leaves the file in an unmerged state. GitKraken will still show the conflict icon, and the merge will not complete.
• Binary files – The visual editor only supports plain‑text. Binary assets (images, compiled libraries) will still require an external tool or manual git merge-file commands.
• Rename/add conflicts – Complex rename/add scenarios may not be fully represented. In such cases, GitKraken will fall back to the CLI or prompt you to use an external merge tool.
• Older GitKraken releases – Versions prior to 2024.3 lack the side‑by‑side view or contain UI bugs that prevent proper resolution. Always keep GitKraken up to date.
• Large files – The editor can become sluggish with very large text files. For heavy edits, consider resolving via the command line.

Verifying the Result

1. In GitKraken’s graph view, confirm that the merge commit appears and that no conflict icons remain.
2. Open the resolved file from the file list and check that it contains the merged content without the <<<< HEAD markers.
3. Run git diff --exit-code in the terminal to ensure the working tree is clean.

If any of these checks fail, revisit the Conflict Editor, ensure the file is staged, and try again.

Conclusion

GitKraken’s visual Conflict Editor streamlines text‑based merge conflict resolution by providing an intuitive, side‑by‑side comparison and an explicit Mark as Resolved action. By following the workflow above, you can avoid common mistakes, stay within the editor’s limits, and confirm that merges complete cleanly.