Skip to content

Conflict and integration handling

AIgency tracks which files each task touches so overlapping work can be flagged and reconciled instead of silently overwritten.

AgentDock Pro

Conflict and integration handling is part of AIgency, available only in AgentDock Pro.

Running tasks concurrently means two tasks can, in principle, touch the same files. AIgency doesn't prevent this outright — instead it detects it and gives you a specific integration-kind task to reconcile the result.

Detecting overlap

When two tasks that could run concurrently declare overlapping file scope, AIgency surfaces this as a warning suggesting the tasks be isolated (see Worktrees) or given an explicit dependency between them, rather than letting the overlap go unnoticed until a conflict shows up in the diff.

Integration tasks

An integration-kind task always runs directly in the shared workspace — never in an isolated worktree — because its entire purpose is to bring separately-isolated work back together. AIgency builds an integration briefing summarizing what each contributing task changed, so the integrating agent has the context it needs to reconcile the results rather than guessing at what happened in each worktree.