Merge, rebase, and conflicts
Run merges and rebases, and resolve conflicts in a 3-pane editor.
- Desktop
- Web Portal
Merging and rebasing both live in the Actions menu in the Worktree header. The mid-operation experience — and especially the conflict resolver — is the same across both.
Merge
Actions > Merge opens the merge menu. Pick the source branch you want to merge into the current branch. Options:
- —no-ff — always create a merge commit even if a fast-forward is possible.
Glueprint runs git merge and switches into mid-merge state if there are conflicts.
Rebase
Actions > Rebase opens the rebase menu. Pick the branch to rebase onto. Options:
- —onto — rebase a specific range onto the target (advanced).
- interactive — run as
git rebase -i.
Glueprint runs git rebase and switches into mid-rebase state if there are conflicts.
Mid-operation banner
When the repo is mid-merge or mid-rebase, the Worktree view shows a banner across the top of the Changes tab and a Conflicts section above the regular changes list. The banner has the operation name and the branch involved, plus controls to:
- Continue — after every conflict is resolved.
- Abort — undo the operation and return to where you started.
- For rebase, Skip — drop the commit currently being applied.
The 3-pane conflict resolver
Click any file in the Conflicts section to open the resolver. The resolver is a Monaco editor with three panels:
- Ours — the version on your current branch.
- Theirs — the version coming from the source branch (or commit being replayed).
- Base — the common ancestor the diff is computed against.
Per-conflict-block controls let you accept ours, theirs, or both (in either order). You can also edit any pane directly if neither side is exactly what you want.
When the resolver shows zero remaining conflict blocks, Save marks the file as resolved — the equivalent of git add on that path.
After every conflicted file is resolved, click Continue in the banner to finish the merge or rebase.
What if I want to bail
Abort in the banner runs git merge --abort or git rebase --abort and puts you back exactly where you started. No changes lost.