Orch Resolve Conflicts
Rule each merge or rebase conflict from both sides' evidence. The code pack's conflict instance.
Install
$ agentstack add skill-danmcinerney-orchflows-orch-resolve-conflicts ✓ scanned · ✓ verified, works with Claude Code, Cursor, and more.
Verified badge
Passed review? Show it. Paste this badge into your README, it links to the public security report.
Links to your public security report.[](https://agentstack.voostack.com/security/report/skill-danmcinerney-orchflows-orch-resolve-conflicts) Reliability & compatibility
Declared compatibility
Compatibility is declared by the source manifest. End-to-end runtime verification is coming, see below.
We're building live execution health for every listing: tool-call success rate, median latency, uptime, and last-checked timestamps, measured, not self-reported. It isn't live yet, so we don't show numbers we can't stand behind.
How agent discovery & health will work →About
Require: a workspace in a conflicted merge or rebase state.
Per conflict: read both sides' intent from their own commits, tests, and tickets — never from the surface diff alone. Rule for the side whose intent the evidence supports, or compose both when they are orthogonal; a ruling states which intent won and why. When both sides' evidence genuinely conflicts on purpose, not text, stop and return the conflict as blocked with both intents — that is a decision, not a merge.
After all rulings, run the workspace's cheapest deterministic oracle; a resolution that breaks the build is not a resolution.
Never: pick a side by recency or size; invent a third behavior neither side had; leave a conflict marker behind.
Return: per-conflict rulings with evidence, the oracle result, and any blocked conflicts with both intents.
Source & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: DanMcInerney
- Source: DanMcInerney/orchflows
- License: MIT
Install and usage instructions live in the source repository linked above.
Reviews
No reviews yet, be the first.
Write a review
Versions
- v0.1.0 Imported from the upstream source.