Three-way merge conflicts resolved methodically — without touching a terminal.
Overview
Merge conflicts are a fact of development, but they don't have to be a time sink. Navique's three-way merge viewer shows Base, Theirs, and Yours side by side with every conflict highlighted. Navigate between unresolved blocks, accept from either side, or write a custom inline resolution. The commit button is disabled until every conflict in every file is resolved — so you can't accidentally commit incomplete merges.
Three-Way Merge Viewer
A full three-way merge conflict resolution environment. Three panels show Base (common ancestor), Theirs (remote branch), and Yours (local branch) side by side. Each conflict block is highlighted. Each block has resolution buttons: Accept Base, Accept Theirs, Accept Yours, or Manual Edit.
Conflict Block Navigation
Previous/Next buttons jump between unresolved conflict markers in the current file. A counter shows '3 of 7 conflicts resolved.' The commit button is disabled until all conflicts in all files are resolved — preventing accidental incomplete commits.
Multi-File Conflict Management
A file list sidebar shows all files with unresolved conflicts, with a count of remaining conflicts per file. Selecting a file loads it in the three-way view. Files are marked with a checkmark when all conflicts are resolved.
Inline Manual Editing
When auto-resolution isn't appropriate, the manual edit mode opens an inline editor within the conflict block. The developer can type the exact resolution they want — mixing content from both sides or writing something entirely new.
Commit Dialog with Message
Once all conflicts are resolved, a commit sheet appears with a pre-populated commit message ('Resolved merge conflicts') that the developer can customise. Committing is a single action that finalises the merge.
Repository Picker
A sheet for selecting the source and destination repositories for a merge operation. Supports both GitHub and Bitbucket repositories. Lists all accessible repos with workspace organisation.