Resolving Git Conflicts in GitKraken’s Built‑In Three‑Way Merge Editor

When a merge turns into a nightmare

Git’s command‑line merge can be a pain when two branches touch the same line. You end up with <<<<<<< markers, a staging area that looks like a jigsaw puzzle, and the risk of committing the markers by accident. GitKraken’s three‑way merge editor claims to turn that chaos into a visual, drag‑and‑drop experience. This post walks through how the editor works, shows a concrete example, and discusses when it shines and when you might need a fallback.

Thesis: A single GUI window can replace the most tedious parts of conflict resolution

GitKraken’s conflict editor displays the three versions of a file side‑by‑side: the Base (common ancestor), Left (your branch), and Right (the branch you’re merging in). You can edit the middle pane directly, drag hunks between panes, and hit Resolve to stage the result. The editor takes care of removing conflict markers and recording the resolution as a single merge commit.

How the editor works: a step‑by‑step demo

1. Set up a minimal repo
   

   # In a terminal, create a new repo
   mkdir demo-repo && cd demo-repo
   git init
   
   echo "line1" > file.txt
   
   git add file.txt
   git commit -m "initial commit"
   

2. Create two branches that touch the same line
   

   # Branch A changes the line
   git checkout -b branch-a
   sed -i 's/line1/branch‑a line/' file.txt
   git add file.txt
   git commit -m "branch a change"
   
   # Branch B changes the same line
   git checkout main
   git checkout -b branch-b
   sed -i 's/line1/branch‑b line/' file.txt
   git add file.txt
   git commit -m "branch b change"
   

3. Merge from B into A
   

   git checkout branch-a
   git merge branch-b
   

   The merge will fail, leaving conflict markers.
4. Open the repo in GitKraken
   GitKraken automatically detects the conflict and opens the built‑in editor. You’ll see four panes: Base, Left, Right, and the Resolved pane.
5. Resolve inline
   Edit the Resolved pane directly—replace the line with your choice or a combination. You can also drag a hunk from Left or Right into the Resolved pane.
6. Click Resolve
   The editor stages the file automatically. Verify by looking at the Staged section in the left sidebar: the file should appear without conflict markers.
7. Commit the merge
   GitKraken presents a single commit dialog. Confirm and commit. The commit history now shows a single merge commit that contains the resolved file.

How to verify the result

• Open the file in a text editor and confirm that <<<<<<<, =======, and >>>>>>> markers are gone.
• Run git diff --staged in the terminal: the diff should show the final content only.
• Check the commit graph in GitKraken: you should see a single merge commit with two parents.

When the editor shines

• Text and structured formats: Works best with plain text, JSON, YAML, or any file that GitKraken can syntax‑highlight.
• Small to medium sized files: The UI renders quickly and can handle typical source‑code changes.
• Team environments: Because the resolution is recorded as a single commit, history remains clean and reverts are straightforward.

Trade‑offs and limitations

• Large binary files: The editor may lag or fail to render diffs for files larger than a few megabytes. In such cases, fall back to git mergetool or a dedicated binary merge tool.
• Advanced custom merge strategies: The free edition only offers the built‑in editor. Enterprise users can configure custom merge tools via the settings, which may be necessary for complex projects.
• Learning curve: While the editor reduces manual marker editing, users unfamiliar with drag‑and‑drop may need a brief practice session.

Actionable take‑away

If you’re already using GitKraken, enable the conflict editor and test it on a small merge first. For projects with heavy binary assets, keep an eye on file size and consider a separate merge strategy. Remember that the editor updates the staging area in real time—use git status or the GitKraken sidebar to verify before committing. With these steps, you’ll cut the time spent wrestling with conflict markers and reduce the chance of accidental commits.