Resolving conflicts

Before you merge

MyTwig tries to warn you early:

• While dragging a branch to merge or rebase, the menu says whether it will conflict and in which files.
• In the background, it checks your branch against its upstream and the remote’s default branch. “Conflicts with origin/main in 3 files” appears at the top of the working tree panel. Click it to list the files, and click a file to see the changes that collide.

Both checks use git merge-tree, which needs Git 2.38 or later, and never touch your working tree.

When a merge or rebase stops

A banner appears over the graph with Continue (or Commit merge) and Abort. The working tree lists conflicted files; the scroll bar mark for your changes turns red.

The conflict editor

Click a conflicted file to open the conflict editor:

• Ours and theirs side by side at the top.
• The result below, which you can edit directly.
• Conflict N of M steps through each conflict. For each, take ours, theirs, or both.
• Or take either side’s whole file.

⌘F finds in either side or in the result; the result also has find and replace.

When every conflict is resolved, stage the file. When all files are staged, click Continue.

With an AI provider set up, the editor can also suggest a resolution for you to review. See AI help.

Changed your mind?

Abort puts everything back as it was before the merge or rebase. After it’s finished, ⌘Z still undoes it.

Prefer another tool?

⌘D opens the file in your diff or merge tool, as set by Git’s merge.tool.