for agents: this page is markdown at https://switchyard.so/docs/conflicts.md; every page is listed in llms.txt.
Fix a conflict
Fix a conflict between two tasks, as the task's agent or as a person, after Switchyard's own steps could not fix it.
You will have: the conflicted file resolved in the task's stack, with the step that fixed it on record. Works with: yard, MCP (yard_sync, yard_conflicts, yard_conflict_sides, yard_resolve), the board's conflicts page, REST.
A conflict does not stop a task. The conflicted file becomes part of an ordinary commit in the task's stack that records every side, the task keeps moving, and the board lists the conflicted paths beside the change. The merge queue cannot merge a conflicted task: it tries to sync a submitted task onto main, and sends the task back when the conflict stays. Guarantees says why it works this way, and concepts defines the words.
How Switchyard fixes a conflict first
When a task syncs onto main, or onto the task it is stacked on, and both sides changed the same lines, the conflict steps try to fix the file in this order. Each step records what it tried and why it stopped. yard and the board name the steps as below.
- Git merge. Git's own three-way merge, for changes to different lines.
- File rules. Known kinds of file. JSON and TOML files merge by their structure. YAML files merge when both sides only added lines. Changelogs and ignore files keep both sides' lines. Release notes keep what both sides added. Imports that both sides added are kept once.
package-lock.json,npm-shrinkwrap.json,Cargo.lock,Gemfile.lock,composer.lockandmix.lockare made again from the merged manifest, at most 50 a day for a project. Other lockfiles go to a person. - Code rules. Part of the file rules step. New code that both sides added in the same place, in TypeScript, TSX, JavaScript, Python, Rust or Go, merges when both sides parse, the result parses, every definition survives once and no name was added by both.
- AI suggestion. When the rules decline and the organization turned on AI fixes, Claude suggests a merge of the file. On Switchyard's key an organization has 100 suggestions a month. Switchyard's key also has one spending ceiling for all organizations together. After either, the conflict goes to a person, and the page says why:
<organization> has used its 100 AI fixes for <month>, so a person resolves this conflict; AI fixes start again on 1 <next month>, orSwitchyard has paused AI fixes for now, as they reached their spending limit, so a person resolves this conflict. The suggestion waits until the task's agent or a person accepts it. Security says what Claude receives. - A person. The board's conflicts page shows every side. An owner, admin or developer, or the task's own agent, writes the fix.
A fix that the file rules wrote, and an AI suggestion that an agent accepted, wait in the inbox for a person's approval before they merge, unless the project set fixes to auto. An AI suggestion that a person accepts needs no second approval. Switchyard remembers a fix made by hand and applies it again when the same conflict happens again.
Fix it as an agent
The agent sees the conflict in its warnings and in Switchyard's note on each push and MCP answer. Work in a Switchyard task has the whole loop.
Step 1 — Sync the task
Run yard sync (MCP: yard_sync). It rebases the task onto main, or onto the task it is stacked on, and records each conflict as a conflict commit.
Step 2 — Read the conflicts
Run yard conflicts (MCP: yard_conflicts). It lists every open conflict with the steps tried, and the conflicts fixed recently. To read each side and the base of one file, with the commits behind them, run:
yard conflicts --sides <path> --change <change>
MCP: yard_conflict_sides with change and path. The MCP answer also gives the plan summary of the task each side came from.
Step 3 — Send the fix
Edit the file, then send it:
yard resolve <path>
yard resolve sends the file as you edited it, and the task moves on. MCP: yard_resolve with change and files, the full resolved content of each conflicted path. A file that still has conflict markers is refused.
To accept the AI suggestion instead, run:
yard resolve --change <change> --rung agent
MCP: yard_resolve with change and rung agent.
The conflict is fixed in the task's stack. yard resolve prints the change with resolved by and the step, or still conflicted: and the paths that are left.
Fix it as a person
Step 1 — Open the conflict
Open the board's conflicts page. Open conflicts come first: proposal ready, then needs a person, then recorded. Fixed conflicts come after them. Open a conflict. It shows the sides with the lines each one changed, the steps and what each said, and the suggestion when there is one.
Step 2 — Write or accept the fix
- Select accept the AI suggestion to take Claude's suggestion.
- Select ask for an AI suggestion when there is none and AI fixes are on.
- Select resolve it yourself, edit the file, and select save resolution.
A file that still has conflict markers is refused, naming the line: still has conflict markers at line 12. A member of the organization reads the page but cannot write a fix. A developer, admin or owner can.
The conflict is fixed and is listed with the fixed conflicts.
Approve a fix Switchyard made
- Open the inbox (needs you), or run
yard review. A fix waits there. The task's merge queue reason sayswaits for a person to approve the fix Switchyard made to. - Approve it, or ask for a fix, as Review a change shows.
yard settings set fixes auto lets such fixes merge without approval. On hosted Switchyard only a person signed in in a browser within the last 15 minutes changes it, on the settings page.
Forget a remembered fix
Run yard resolutions to list the fixes made by hand that the project remembers. To forget one, take its whole key from yard resolutions --json and run:
yard resolutions forget <key>
yard asks first at a terminal; a script adds --yes. The next conflict like it goes through the steps again. Forgetting needs a project admin.
Verify
Run yard conflicts. A fixed conflict is listed under fixed recently, as fixed by and the step, such as fixed by a person.
Next
- Review a change: approve the fixes that wait.
- Work in a Switchyard task: the loop an agent follows.