17 tagged conflict resolution, measured the same way as everything else here.
Browse within: agent-tools 9claude-code-hooks 9consistency 9
Skill Claude CodeCodex
Entity-level semantic merge driver for Git. Resolves conflicts at the function/class level instead of the line level, so two changes to different functions in the same file never conflict.
linkpranay-ai/context-engineering-protocol
Skill Claude CodeCodex
Compile scattered guideline sources into one scope-aware COMPILED-GUIDELINES.md for other skills and ult-context-generate's Constraints layer. Do NOT use to enforce rules at runtime.
Knuckles-Team/repository-manager
Skill Claude CodeCodex
Land a branch into a shared base that dozens of other lanes are landing into at the same time, and reconcile it when it conflicts. Covers the serialized merge queue, per-repository gate declarations, differential gating against a base ref that is legitimately red, measuring the MERGED tree rather than the branch tip…
Republicofhaitigoodstory6175/engram
Skill Claude CodeCodex
Show how many tokens engram has saved in this session, this week, and across all indexed projects. Use when the user asks about token usage, savings, costs, or wants a digest report.
Republicofhaitigoodstory6175/engram
Skill Claude CodeCodex
List past mistakes engram has learned in this project — failures, regressions, broken assumptions. Use before starting a non-trivial change to surface relevant prior failures, or when debugging to check if this issue has been seen before.
Republicofhaitigoodstory6175/engram
Skill Claude CodeCodex
Query engram's local knowledge graph for structural context — function calls, imports, type relationships, mistake history, ADRs. Use when the user asks "how does X work in this project", "what calls Y", "where is Z used", or any structural question that doesn't need file content.