Resolving Merge Conflicts in GitKraken: A Visual, One‑Click Workflow

The Problem

Merging branches is a core Git operation, but when the same file is edited in both branches, Git stops and flags a conflict. Traditionally, developers open an editor, look for <<<<<<< markers, and manually stitch the code together. This process is error‑prone, especially for large files or when the conflict spans multiple sections.

Why GitKraken’s Conflict Resolver Matters

GitKraken’s desktop client offers a dedicated conflict pane that:

• Shows a side‑by‑side diff of the conflicting sections.
• Auto‑populates the ours and theirs panes.
• Provides inline Accept buttons for each change, a Merge button, or an editor for custom edits.
• Records the resolution as a single merge commit, keeping the history clean.

By keeping the entire workflow inside the client, developers avoid context switches and reduce the chance of leaving stray conflict markers in the code.

How the Tool Works

When GitKraken detects a conflict during a merge, the following happens:

1. The Conflict View opens automatically, overlaying the file tree.
2. Each conflicted file is listed with a ⚠️ icon.
3. Clicking the file splits the editor into two panes: Ours (current branch) on the left, Theirs (incoming branch) on the right.
4. Inline buttons appear next to each conflicting block:
• Accept Ours – keep the left side.
• Accept Theirs – keep the right side.
• Merge – combine both sides, leaving the conflict markers for manual review.
5. After resolving all blocks, click Finish Merge at the top of the pane. GitKraken stages the resolved file and creates a merge commit.

The commit message defaults to Merge branch 'feature' into 'main', but you can edit it before finalizing.

Practical Example: Merging a Feature Branch

Assume you have a repository with a main branch and a feature branch named feature‑login. The main branch has added an authentication helper, while feature‑login modifies the same helper. Follow these steps:

1. Open the Desktop Client and switch to the main branch.
2. Start the merge:

git merge feature-login

Run this command in the terminal embedded in GitKraken or use the Merge button from the branch menu.

3. GitKraken detects a conflict and opens the Conflict View.
4. Navigate to src/auth/helper.js. The left pane shows ours, the right pane shows theirs.
5. For each conflicting block, click Accept Ours or Accept Theirs as appropriate. If you need both, click Merge and edit the block manually.
6. Once all blocks are resolved, click Finish Merge at the top.
7. Verify the merge commit:

git log --oneline -n 5

You should see a new commit titled Merge branch 'feature-login' into 'main' that includes the resolved helper.js.

8. Push the changes:

git push origin main

Throughout, the UI shows a progress bar and a summary of resolved files.

Trade‑offs and Limitations

• Desktop‑Only Feature: The visual conflict resolver is available only in the GitKraken desktop client. The web app lacks a full conflict editor, so teams relying on the web interface must still resolve conflicts manually.
• Binary Files: Large binary or non‑text files (images, PDFs) don’t render in the diff pane. For these, you’ll need to resolve the conflict via git mergetool or an external merge tool.
• Complex Merge Strategies: The tool assumes a standard three‑way merge. If you use custom merge drivers or complex strategies, the inline buttons may not reflect the desired outcome.
• Undoing a Merge: Once you finish the merge, the commit is created. If you need to revert, you’ll have to use git revert or reset the branch, which GitKraken also supports but requires a manual step.

Actionable Takeaways

1. Use the Conflict View for Quick Resolutions: For most text‑based conflicts, the inline buttons save time and reduce mistakes.

2. Keep an Eye on the Commit History: Each merge commit is a single, auditable change. Verify the commit message and file list before pushing.

3. Plan for Binary Conflicts: If your repo contains large binaries, set up a dedicated merge driver or resolve those conflicts outside GitKraken.

4. Leverage the Built‑In Editor: For custom edits, the integrated editor supports syntax highlighting and line numbers, making manual merges less error‑prone.

By integrating GitKraken’s visual conflict resolver into your workflow, you can turn a potentially stressful merge into a quick, confidence‑boosting operation.