> ## Documentation Index
> Fetch the complete documentation index at: https://ade-ac1c6011-ade-mobile-chat-stability-54bd7ef0.mintlify.site/llms.txt
> Use this file to discover all available pages before exploring further.

# Conflicts

> Find likely merge conflicts between lanes before they block a PR.

ADE helps you see conflict risk while work is still in progress. It compares active lanes and shows where two branches are likely to collide.

## Where conflicts appear

* Lane status badges.
* Workspace Graph edges.
* PR detail views.
* The Conflicts page.

## How to use conflict signals

<Steps>
  <Step title="Notice the warning">
    A lane, graph edge, or PR shows conflict risk.
  </Step>

  <Step title="Open the details">
    Review the lanes, files, and summary of the overlap.
  </Step>

  <Step title="Decide the merge order">
    Sometimes the easiest fix is to land one branch first and rebase the other.
  </Step>

  <Step title="Resolve if needed">
    Use Files, Git, or an agent-assisted pass to resolve the conflict.
  </Step>

  <Step title="Re-run checks">
    Run tests and recheck PR state after the conflict is gone.
  </Step>
</Steps>

## Risk levels

| Level  | Meaning                                                |
| ------ | ------------------------------------------------------ |
| Low    | Some overlap, but likely easy to merge.                |
| Medium | Shared files or nearby changes need review.            |
| High   | Merge is likely to block or require manual resolution. |

## 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.

<Warning>
  Conflict prediction is a warning system. Always verify with Git, tests, and PR checks before merging.
</Warning>