notverysalty

Resolve Merge — Git skill for Claude Code

Git community

Semantically resolve git merge conflicts in knowledge files (union — never drop knowledge; regenerate artifacts).

How to install Resolve Merge

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.

What Resolve Merge does

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

Alternatives in Git

  • Bulletproof Quick Start Guide — Target Audience: Complete beginners Never used Python/git before 11.1k ★
  • Push And Release — Git pull, resolve conflicts, push, fix hook errors, then release 1.6k ★
  • GitHub Review PR — Use when a PR needs full review — resolves merge conflicts with the base first, then fixes CI failures, then a 1.5k ★

Full documentation available on GitHub

View Source Repository

Related Skills

Ruver Lstm — Git skill for Claude Code

Ruver Lstm

Looks shit to me. Address review comments and merge conflicts on an existing PR. Verify, patch, reply, resolve

Git community
Resolve Conflict — Git skill for Claude Code

Resolve Conflict

You are resolving git merge/rebase conflicts. Follow this procedure, and briefly tell the user what you're doi

Git community
Vault Resolve Conflict — Git skill for Claude Code

Vault Resolve Conflict

Resolve real git merge conflicts in vault files (propose only, human confirms)

Git community
Conflict Resolver — Git skill for Claude Code

Conflict Resolver

Resolve merge conflicts on develop branch

Git community
Land Ticket — Git skill for Claude Code

Land Ticket

Publish + close a ticket — open the Linear-linked PR if needed, analyze conflicts by reading code, resolve, mi

Git community
Bob Fix Precommit — Git skill for Claude Code

Bob Fix Precommit

Run pre-commit on a git repo and resolve everything it fires, where safe to auto-fix. Never auto-allowlists se

Git community

Related Agents

Merge Resolver — Development agent for Claude Code

Merge Resolver

Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict

Development community
Git Pull — Development agent for Claude Code

Git Pull

Safely pull updates (fork/upstream aware), stash-first, resolve conflicts via memory-bank context, no auto-sta

Development community
Git Assistant — Research agent for Claude Code

Git Assistant

Use this agent for complex git operations like rebasing, cherry-picking, resolving merge conflicts, managing b

Research community