Agents Now Resolve Merge Conflicts Between Their Own Tasks
When two tasks' changes conflict after one merges first, the responsible agent now resolves it automatically instead of someone needing to step in.
Summary
Because agents often work on several tasks side by side, two tasks can end up touching the same part of a project, and whichever merges first can leave the other in conflict. Effigate Command Center now detects that automatically and sends the affected task's own agent to resolve it, instead of leaving it sitting unnoticed.
What You Gain
Before, if two tasks changed the same files and one merged ahead of the other, the second task's proposed change would conflict, and nothing acted on that by itself. It sat there until a person noticed and manually asked the agent to sort it out, which could mean finished work stalling for hours.
Now, every time a change merges, Effigate Command Center checks whether any pending task would still merge cleanly. If a real conflict is found, the task's own agent is automatically asked to bring in the latest version, resolve it while keeping both sets of changes, re-test, and push the fix. The task tells you this happened, and the fix goes through review and merging as usual. If the agent can't resolve it after a couple of tries, it's raised to you as a merge conflict needing a decision.
How It Works
- Automatic detection, fixed by the right agent. Each time a task's change merges, every other pending task is checked for a real conflict; the agent responsible for the affected task brings in the latest changes, resolves it so both pieces of work are kept, re-tests, and pushes the fix.
- Limited, safe retries. A conflict gets up to two automatic resolution attempts. If it still can't be resolved, it's escalated to Decisions with the detail you need to step in.
- Agents are now aware of each other's work. When a run starts, the agent can see which other tasks in the project are still open, so it's less likely to touch work from a task running alongside it.
Where to Find It
This runs automatically for every project with no setup required. If you ever see a merge conflict land in Decisions, it means an agent already tried and couldn't resolve it on its own — everything else is handled silently in the background.
See what else shipped that month on the Effigate Command Center changelog, or try Effigate Command Center to see your agents work in parallel.