Skill

resolve-merge-conflicts

Resolve git merge/rebase conflicts non-destructively — preserving the intent of BOTH sides — and hand off to a human when a conflict can't be resolved safely. Use when a branch or PR has conflicts with its base ('this branch has conflicts that must be resolved', GitHub mergeable=CONFLICTING / mergeStateStatus=DIRTY), when a rebase / merge / cherry-pick / stash / revert stops with conflict markers (<<<<<<< ======= >>>>>>>), when a PR is behind base and needs updating, when syncing a long-lived branch or back-merging a hotfix, or when deciding rebase vs merge. Covers the safe-resolution rules (no blind -X ours/theirs, hunk-by-hunk with diff3, abort/reflog escape hatches, verify-after), the rebase ours/theirs inversion, lockfile/rename/semantic conflicts, and the escalate-when-stuck criteria.

Bundled with Stealth Company — Agent Skills. Its trust score, security findings and other files are on the plugin page.

SKILL.md

Path
skills/resolve-merge-conflicts/SKILL.md
Size
8.0 KB
SHA-256
82172fa5a995c52b665cebd0a20e5bf8a0bc0069af53db93e09d0cf384eeb4ee

Install

Install the plugin's skills with the Skills CLI:

npx [email protected] add stealth-factory/skills