Skill

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

v1.2.3MIT3/3 watchmen clearedinstructions only

Take it home

Then run, where you saved it
mkdir -p ~/.marktplatz/claude-code/.claude-plugin
mv marketplace.json ~/.marktplatz/claude-code/.claude-plugin/
claude plugin marketplace add ~/.marktplatz/claude-code
claude plugin marketplace update marktplatz
claude plugin install resolving-merge-conflicts@marktplatz
claude plugin update resolving-merge-conflicts@marktplatz

Read the recipe below before you install; it is what your agent will follow.

Put it in thy scroll with others →

The recipe SKILL.md

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.

  2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

  3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

  4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

  5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

What's inside

Every turn it costs ~24 tokens of context (its name and description); when it fires, ~199 more. It is instructions only, no scripts.

The watch

SpectorCiscoATR Cleared by all 3 watchmen.
WatchmanVersionNotesReport
SkillSpector NVIDIA2.9.6–raw
Skill Scanner Cisco AI Defense2.1.01raw
Agent Threat Rules the ATR project4.0.0–raw
Read the 1 note
  • info Skill Scanner MANIFEST_MISSING_LICENSE: Skill does not specify a license

Scanned offline at admission. Each watchman's raw report is linked above, and the summary the market reads is kept beside them; see also what the watch does and does not prove.

Provenance

Taken from mattpocock/skills at tag v1.2.3, commit 6acc160e4e0c, folder skills/engineering/resolving-merge-conflicts, under the MIT charter. The market serves this exact copy from commit 8f3e8e3e01bb of marktplatz-dev/marktplatz-dev; its files hash to sha256-280eb22780c4fecf80c7ca9eeb0e39eb8500088dbb592d89e8c379e0f864f3df.