Resolving Conflicts
Merge options, conflict prediction and a two-pane merge editor that auto-advances
GitBor's conflict resolver is a two-pane editor on top of Git's standard conflict markers. It opens automatically when a merge or rebase hits a conflict.
Starting a merge
Right-click a branch in the sidebar → Merge into current. The dialog offers:
| Option | What it does |
|---|---|
| Default | Regular merge — fast-forward when possible. |
| No Fast-Forward | Always create a merge commit, even when fast-forward would do. |
| Squash | Place changes in the index without committing — you make one combined commit yourself. |
| Don't Commit | Apply the merge but don't commit, for last tweaks before committing. |
Before merging, GitBor does a dry run and lists the files that are likely to conflict, so you can decide whether to merge now or rebase onto the latest version first.
Merge in progress
If the merge produces conflicts, a banner appears at the top of the window with an Abort button (with confirmation — it cancels the merge entirely and restores the pre-merge state). The same banner pattern is used for in-progress cherry-pick, revert and rebase. Conflicting files are marked with (!) in Local Changes, and GitBor automatically selects the first one and opens the merge editor.
The merge editor
A two-pane editor:
| Pane | What's in it |
|---|---|
| Ours (left) | The version from your current branch. |
| Theirs (right) | The version from the branch you're merging in. |
Below the panes is the result buffer — what actually gets written to the file.
Ways to resolve each block:
- Click a conflict block in Ours or Theirs to copy it into the result.
- Accept Ours / Accept Theirs, or Both (Ours first) / Both (Theirs first) to combine.
- Accept All Ours / Accept All Theirs to take one side for the whole file.
- Edit the result buffer directly for a custom mix.
A counter shows progress ("2/5 conflicts resolved"). The Save & Resolve button activates once no conflict markers remain. After resolving, GitBor writes the file, stages it (git add), and opens the next conflicting file automatically.
Understanding a conflict with AI
The editor toolbar has an Explain conflict button. It does not resolve anything — it summarizes what each side changed and what to consider before picking one. See AI Helpers.
Finishing the merge
Once every conflicting file is resolved and staged, GitBor offers to finish with a normal commit and the default message (Merge branch 'X'). You can edit the message before confirming.