Licensing, versioning & project policy
Privacy, data & your account
Feedback, roadmap & support
Troubleshooting & error codes
Semantic & behavioral versioning
Plugins
Automation: SDK, MCP & CI
Editors, desktop & the shell
AI agents & capability tokens
Audit & compliance
Permissions, keys & secrets
Collaborate & sync
Conflicts
A conflict is an object, not a broken checkout
List every open conflict
Resolve conflicts interactively
Take one side
Resolve a delete-modify or rename-rename
Accept what is already on disk
Resolve one region at a time
Let an AI plugin propose a resolution
Lanes, changes & history
Everyday version control
Coming from Git
Install & set up
Start here
Tovio
💬
Feedback
🗺️
Roadmap
📕
Docs
    Home
  1. Conflicts
⚡⚡

Conflicts

Conflicts are objects in the repository, not damage to your working tree.

By Dustin

•

8 articles