Conflicts
Conflicts are objects in the repository, not damage to your working tree.
- A conflict is an object, not a broken checkoutWhy your tree still builds, and what is actually blocked.
- List every open conflicttovio conflicts, and reading what it tells you.
- Resolve conflicts interactivelytovio resolve, walking each one.
- Take one side--ours, --theirs, --base.
- Resolve a delete-modify or rename-renameThe typed conflicts, and their own flags.
- Accept what is already on disk--working-tree, when you have edited the file yourself.
- Resolve one region at a time--region, for files where each side got something right.
- Let an AI plugin propose a resolutionresolve --ai, and what the resolver can see.
- What a conflict object actually holdsThe stored shape: three sides, two change ids, a status, and a resolution.
- Record why you resolved it--why and the rationale flags, so the next person is not guessing.
- Your resolutions are remembered and replayedResolve once; the same conflict tries not to ask twice.
- Keep building while a conflict is openWorking, and depending on someone else's conflicted work.
- Landing with a conflict openWhat land actually refuses, and what it lets through.
- Resolve conflicts from your editorThe VS Code extension's conflict surface, and where JetBrains stands.
- How an AI agent encounters and resolves a conflictThe MCP tools, and the scope that bounds them.