Multi-agent workspace isolation — each agent gets its own working directory with file-level locking
Complete isolation. Each agent has its own copy of all files. No shared state. Best for conflicting changes.
Agents can read shared files but write to their own branch. Good for agents working on different features.
Agents share the workspace with file-level locking. Fastest but requires conflict resolution. Default mode.
No active worktrees
Create a worktree to start multi-agent collaboration
Simple linear merge when no divergence exists. Fastest but requires clean history.
Standard merge using common ancestor. Handles most conflicts automatically.
Always accept the latest change. No conflicts but may lose earlier work. Use with caution.