Resolving conflicts

When a merge, rebase, cherry-pick or revert stops on conflicts, Resolve conflicts opens the resolver. It takes over the window until you are done.

The three panes

Yours (blue) and Theirs (amber) are labelled with their branch names. Result, in the middle, is what will be saved, and you can edit it. Ribbons show where each line goes, and every line in the Result is marked by where it came from: blue from Yours, amber from Theirs, mint typed by you.

Pick, line by line or by block

• Click the circle beside a line to include just that line.
• Use the round buttons in the gutter to take a whole block from one side.
• Or press 1 Yours, 2 Theirs, 3 both.
• Type in the Result to write your own.

When a block is right, Mark as resolved (⌘↵). Move between conflicts with [ and ], and between files with ⌘[ and ⌘].

Views and options

• Weave, Classic and Inline show the same session in different ways (V switches).
• Word diff (W) highlights the words that changed. Base adds the common ancestor.
• Auto-resolved lists conflicts Ramo settled for you (import order, whitespace, identical changes). Review them before you continue.

Finish

Once every file is resolved, Continue (⇧⌘↵) completes the merge or rebase. Abort goes back to where you were. Your work in progress is saved as you go, so you can quit and come back.

Images and other files

For images, compare the two versions side by side, with a swipe handle, a fade or the difference, then keep Yours, Theirs, or both under different names. Other binary files show a preview of each side to choose from.

A suggested resolution

With an AI assistant connected and Suggest conflict resolutions on, a card proposes how to resolve the current block and why. Apply suggestion fills the Result, which you can still edit or reset. Nothing is applied on its own.