Skill
https://litlfred.github.io/folio-assistant/cat-harness/skill/merge-conflict-patterns
JSON-LD · in graph cat-harness.jsonld ·
| name | merge-conflict-patterns |
|---|---|
| title | Merge-conflict patterns — what a merge may resolve on its own |
| description | Merge the base branch in and resolve, without a person, only the conflicts a DECLARED pattern covers — generated files, generated README regions, QA sidecars — then prove the result with the gate set. Refuses the whole merge when any conflict is authored or undeclared. Use for "merge main", "resolve the conflicts", "the PR is conflicted again", "auto-resolve", and when adding a pattern for a new kind of churn. Also governs what a merge steward does with a merge-train member it had to refuse: one deduplicated work item under the PR's own epic, a hand-back to the owning session with a fail condition, one dispatched agent when nobody owns it, one PR comment, and the close. |
| inPackage | sdlc-core https://litlfred.github.io/folio-assistant/cat-harness/package/sdlc-core |
| instructionsPath | sdlc/skills/sdlc-core/merge-conflict-patterns.md |
| instructionLines | 867 |
| hasInstructions | true |
| hasIOContract | false |
| ambiguous | false |
| inSubgraph | sdlc https://litlfred.github.io/folio-assistant/cat-harness/directory/sdlc |