Conflict Resolution

When a merge, rebase, or pull can’t apply cleanly, ichi opens the conflict resolution view instead of leaving you to untangle conflict markers in an editor.

How you get here

Any operation that can conflict drops you into this view automatically:

• :merge a branch with divergent changes
• :rebase onto a branch that touched the same lines
• :pull when local and remote both changed a file

Resolving

The view walks you through the conflicting files and hunks, showing the competing sides so you can choose what to keep. Navigate with the usual keys:

Key	Action
j / k	Move between conflicts
Tab	Switch focus / side
Enter	Choose / confirm
Esc	Back

Once a conflict is resolved, the file is staged so you can continue the merge or rebase. Press ? in the view for the exact keys available.

After resolving

When every conflict is settled, finish the operation and review the result:

• Return to the graph (g) to confirm history looks right.
• Commit the merge if one is pending.

Next

• Branches for merge and rebase.
• Push, Pull & Fetch to sync once you’re clean.