Choosing Between GitKraken’s Built‑In Merge Editor and an External Tool for Team Conflict Resolution

Decision at a Glance

When a merge conflict appears in GitKraken you have two supported paths: resolve it with the built‑in three‑way editor or hand off to an external merge tool such as VS Code, Beyond Compare, or any command‑line mergetool that accepts Git’s standard BASE, LOCAL, REMOTE, MERGED arguments. The choice affects licensing, cross‑platform consistency, context‑switching overhead, and the richness of editing features available during resolution.

Supported Options Compared

Aspect	Built‑In Editor	External Tool (e.g., VS Code)
Installation	None – ships with GitKraken	Requires the tool to be installed on every machine
Licensing	Free with GitKraken subscription	May need separate licences (Beyond Compare) or none (VS Code)
Context Switching	Stays inside GitKraken window; conflict markers shown on commit graph	Opens separate window; loses visual link to graph
Editing Features	Side‑by‑side diffs, inline accept actions, syntax highlighting (9.x+)	IntelliSense, extensions, multi‑cursor, familiar keybindings
Binary Conflict Handling	Text only; binary files fall back to external tool	Depends on tool – many handle binary diffs
Performance on Large Sets	Slower with >50 conflicted files	Often batches more efficiently
Configuration Scope	Global, no repo‑level sharing	Per‑user in GitKraken preferences; not stored in repo

Trade‑Offs for a Team

• Consistency across OSes – The built‑in editor behaves identically on Windows, macOS, and Linux. If your team spans platforms and you want a single, zero‑config experience, stay internal.
• Developer Muscle Memory – Teams already standardised on VS Code (or another IDE) gain speed from familiar shortcuts, extensions, and language services. The external tool can reduce resolution time for complex, multi‑file conflicts.
• Licensing Budget – Beyond Compare requires a paid licence per seat; VS Code is free. Verify the cost model before mandating an external tool.
• Binary Assets – If your repo contains images, compiled assets, or other non‑text files that conflict, the built‑in editor cannot resolve them; an external tool that supports binary diffs becomes necessary.
• Large Conflict Batches – When a feature branch diverges heavily and produces dozens of conflicted files, external tools often process the batch faster and with less UI lag.

Concrete Implementation: Wiring VS Code as the External Merge Tool

1. Open GitKraken → Preferences → Merge Tool.
2. Select Custom from the dropdown.
3. In the Command field enter the VS Code invocation that waits for the merge to finish:

   code --wait $MERGED

   Note: $MERGED is a placeholder GitKraken expands to the path of the file being merged. The --wait flag keeps the VS Code process alive until you close the merge tab, signalling completion to GitKraken.

4. Leave Arguments empty (the command already contains the placeholder).
5. Click Save.

After saving, initiate a merge that produces a conflict (e.g., git merge feature-branch from the CLI or via GitKraken’s UI). GitKraken will launch VS Code for each conflicted file. Resolve the conflict in VS Code, save, close the tab, and GitKraken will stage the resolved file automatically.

Validation Checklist

• Launch Test – Create a temporary repo, make conflicting edits on two branches, start a merge in GitKraken, and confirm VS Code opens with the correct three‑way layout (BASE, LOCAL, REMOTE, MERGED).
• Log Inspection – Open Help → Show Logs in GitKraken after a merge. Look for lines containing mergetool to verify the external command was invoked without errors.
• Result Verification – After resolving, ensure the merge commit appears in the commit graph, the working directory shows no conflict markers (<<<<<<<), and git status reports a clean working tree.
• Cross‑Platform Run – Repeat the test on each OS your team uses. Confirm the code command is on PATH (Windows: add VS Code to PATH during install; macOS/Linux: shell command install from VS Code).

Limitations & When to Re‑Evaluate

• The built‑in editor cannot resolve binary conflicts; you must fall back to an external tool for those files.
• External tool configuration lives only in each user’s GitKraken config – it is not version‑controlled. Document the required command in your onboarding guide.
• If GitKraken manages SSH keys, ensure the external tool can access the same credentials for any remote operations that might be triggered during a merge (rare, but possible with submodule updates).
• Performance gains from external tools are most visible with >50 conflicted files; for smaller merges the built‑in editor is often faster because it avoids process startup overhead.

Quick Decision Flow

1. Does the team need binary conflict resolution? → External tool required.
2. Is the team mixed‑OS with no standard IDE? → Built‑in editor for zero‑config consistency.
3. Are developers already proficient in VS Code (or another supported tool) and do they handle large conflict batches regularly? → External tool for productivity.
4. Is licensing budget a constraint? → Prefer built‑in or free tools (VS Code).

Apply the flow, configure once per machine, and validate with the checklist above. The result is a repeatable, team‑wide conflict‑resolution workflow that matches your constraints.