AI agent file conflicts
RAAV uses file claims, branch lanes, and conflict checks to catch overlapping work before the edits collide.
Merge conflicts from overlapping agent edits are discovered late, at diff time, after the work is already tangled.
Before an agent edits, `raav conflicts` compares its intended files with active claims. A collision is visible while the scope is still easy to change, not after two branches contain competing implementations.
A merge conflict is the late symptom. The real issue is that two agents chose the same surface without knowing. RAAV checks ownership before the edit begins.
When an agent is about to touch a surface another agent already claimed, RAAV can surface that conflict up front instead of at merge time.
That turns a painful rebase into a quick coordination decision.
Swimlanes and claims show which agent owns each file. Agents use the same ownership record to avoid one another.
The same ownership record warns agents and explains the risk to the founder.
A common product record keeps agents from inventing separate plans. If their claims overlap, the resolution remains attached to the work.
Fewer collisions, and a record when they do happen.
RAAV does not replace your coding agent. It gives the agent a durable operating system for product truth, task ownership, and proof.
An agent claims files and a lane for its task.
RAAV surfaces conflicts with other active claims.
Agents split surfaces or sequence work instead of colliding.
The founder can see the overlap, owners, and agreed next move.
Ask your agents to claim and check conflicts in RAAV before editing. Overlap becomes a decision, not a merge disaster.
Install RAAV in this repo. Before editing, each agent should claim files, check conflicts against active claims, and coordinate on shared surfaces. Show me any current overlaps.Conflict checks use recorded claims and paths. They do not infer ownership from a generated summary.
Most tools either write code or track human tickets. RAAV sits between the founder and the coding agents as shared product memory, coordination, and audit.
Founders ask how RAAV reduces merge pain across parallel agents.
No. Claims are a visibility mechanism, not an OS-level lock. They let agents and the founder see active ownership before edits overlap.
Claims and conflict checks are part of the agent operating loop RAAV syncs into rules files. The record still shows overlap, so resolution is faster even in the worst case.
No. RAAV checks recorded claims and project state; the connected coding agent still performs the implementation.
Conflict checks are included in the Trial at €10/week. Solo and Team add capacity and shared visibility. New accounts are still admitted through the waitlist.