ingest_triage
FeaturedClassify and resolve conflicts detected during bundle ingest (structural duplicates, definitional contradictions, near-duplicate clusters, re-ingest changes, evictions).
Install
Quality Score: 96/100
Skill Content
Details
- Author
- Kaelio
- Repository
- Kaelio/ktx
- Created
- 4 months ago
- Last Updated
- today
- Language
- TypeScript
- License
- Apache-2.0
Similar Skills
Semantically similar based on skill content — not just same category
resolve-conflicts
Resolve an in-progress Git merge, rebase, or cherry-pick conflict by reconstructing the intent of both sides, preserving compatible behavior, and validating the resulting code and history.
resolving-merge-conflicts
Detects an in-progress rebase/merge and resolves real conflicts here: src/**/tests/** logic (handed back), provenance sidecars, package.json dependencies, tracker collisions — gated, pushed signed. Derived-artifact conflicts auto-resolve via ADR-0024 first. Use for /resolving-merge-conflicts, "resolve the merge conflicts", "the rebase is conflicting", "git says CONFLICT", or "help me finish this rebase". Skip for CI failures or bot findings.
resolve-rebase-conflicts
Settle the conflicts a stopped rebase left behind. Mechanical ones resolve without asking and the rest arrive with the evidence in front of you. Every path gets a classification first. An append-only sorted list becomes the verified union of both sides. A generated file takes one side whole and waits for its generator. Everything else is a real disagreement with what each side changed printed beside it. The rebase skill calls this at every stop. Use it directly whenever a rebase or cherry-pick stops on a conflict and the user asks to resolve it.