rebase_conflicts
See each rebase conflict as two diffs from the base to understand both intents and combine them, avoiding marker noise.
Instructions
Report each conflict as what the two sides did, rather than as markers.
Per contested region you get two diffs from the common base: one for the
branch built so far, one for the commit being replayed. Read them as two
intents and compose them -- "wrap this block in an if" plus "swap this
call" is usually just both.
Regions only one side changed are not listed: git merged those already.
context is how many unchanged lines to show around each change. Raise it
when the region is hard to place -- which function it is in, whether the
lines above already do what the replayed commit is adding. Set
include_full_sides for the three whole texts when even that is not enough.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo | No | . | |
| context | No | ||
| include_full_sides | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| files | Yes | ||
| guidance | Yes | ||
| replaying | Yes | ||
| replaying_body | Yes |