Resolving Merge Conflicts

When a merge, rebase, or cherry-pick results in conflicts, Branqo provides a powerful 3-pane conflict editor to resolve them visually.

Detecting Conflicts

When a conflict occurs:

1. Branqo shows a notification with the number of conflicted files
2. The Changes panel highlights conflicted files with a red icon
3. Click any conflicted file to open the conflict editor

The 3-Pane Editor

The conflict editor shows three panes:

• Left (Ours): Your changes (the branch you're merging into)
• Right (Theirs): Their changes (the branch being merged)
• Bottom (Result): The merged result that will be saved

Resolving Conflicts

For each conflict region:

1. Click Accept Ours to keep your changes
2. Click Accept Theirs to keep their changes
3. Click Accept Both to include both changes
4. Or manually edit the result pane

Keyboard Shortcuts

AI Conflict Resolution (Premium)

Premium users can use AI to suggest conflict resolutions:

1. Click the AI Resolve button in the conflict editor toolbar
2. The AI analyzes both sides of the conflict and suggests a merged result
3. Review the suggestion in the result pane
4. Accept, modify, or reject the suggestion

The AI considers the surrounding code context, variable names, and logic flow to produce intelligent merges — not just line-by-line comparisons.

Privacy

Before sending code to the AI:

1. The Secret Scanner (on by default) redacts API keys, passwords, tokens, and other secrets
2. Only the conflicted regions and surrounding context are sent — not the entire file
3. Code is processed and immediately discarded — never stored or used for training

After Resolving

Once all conflicts in a file are resolved:

1. Click Mark as Resolved in the conflict editor
2. Repeat for all conflicted files
3. Click Continue Merge (or Continue Rebase) in the toolbar