notverysalty

Resolve Merge

Name: Resolve Merge
Author: notverysalty

Git community

SOURCE https://github.com/notverysalty/lore-plugin/blob/main/commands/resolve-merge.md

Description

--- description: Semantically resolve git merge conflicts in knowledge files (union — never drop knowledge; regenerate artifacts) --- Use the `resolve-merge` skill to resolve git merge conflicts under `docs/ai-knowledge/`: identify conflicted files → merge knowledge files semantically by frontmatter + body union (never drop an entry) → never hand-resolve generated artifacts (INDEX / rules) — rerun the generator to converge → PII self-check → validate with `--check`. Does not auto-commit; the us

Installation

Installs to ~/.claude/skills/notverysalty-lore-plugin-resolve-merge/SKILL.md

Terminal

mkdir -p ~/.claude/skills/notverysalty-lore-plugin-resolve-merge && curl -fsSL https://raw.githubusercontent.com/notverysalty/lore-plugin/HEAD/commands/resolve-merge.md -o ~/.claude/skills/notverysalty-lore-plugin-resolve-merge/SKILL.md

Restart Claude Code, or start a new session, for it to be picked up.