Where conflicts appear
- Lane status badges.
- Workspace Graph edges.
- PR detail views.
- The Conflicts page.
How to use conflict signals
1
Notice the warning
A lane, graph edge, or PR shows conflict risk.
2
Open the details
Review the lanes, files, and summary of the overlap.
3
Decide the merge order
Sometimes the easiest fix is to land one branch first and rebase the other.
4
Resolve if needed
Use Files, Git, or an agent-assisted pass to resolve the conflict.
5
Re-run checks
Run tests and recheck PR state after the conflict is gone.
Risk levels
Prevention
- Keep lanes narrow.
- Stack related changes instead of editing the same area from unrelated lanes.
- Rebase long-running lanes regularly.
- Use Graph before merging several PRs.
- Ask an agent to explain a conflict before asking it to fix one.