Documentation
README
Resolve conflicts by intent, not by line order.
Workflow
- Run preflight conflict detection. If no local merge/rebase/cherry-pick conflicts are present, automatically fetch and merge
origin/main. - Identify conflicted files and candidate commits.
- Map each conflicting commit to its PR.
- Read PR title and description to extract intent.
- Detect intent divergence and request user intervention.
- Resolve conflicts to preserve both intents when compatible.
- Validate behavior with targeted checks.
- Summarize decisions and any tradeoffs.
0) Preflight: Ensure a Conflict Exists
If there are no active unmerged paths, proactively merge latest origin/main to surface conflicts:
git status --porcelain
git diff --name-only --diff-filter=U
Decision rule:
This is the opening of the README. Read the full README on GitHub.