Resolve Merge Conflicts
Resolve git conflicts from compact context — unresolved paths, conflict hunks, ours/base/theirs diffs
- What
- Resolve git conflicts from compact context — unresolved paths, conflict hunks, ours/base/theirs diffs
- Cost
- Free
- Needs
- an AI agent harness (Claude Code, Codex, Pi, Antigravity, Hermes, or Muse) and a git repo with conflicts to resolve
- Install
- Copy the installer prompt below into your Muse — your agent does the rest.
Curated by Skill Harbor — a context-economy trick for the most common agent pain point: merges. When a merge, rebase, cherry-pick, or stash pop stops on conflicts, this skill extracts only unresolved paths, conflict hunks, and compact diffs (companion script extract_conflict_context.py) instead of loading whole files into context — then drills into one conflicted file at a time with the ours/base/theirs sections and a compact ours-vs-theirs unified diff. Take one side wholesale (git checkout --ours/--theirs) when appropriate, else edit directly and strip markers, then re-check unmerged paths and validate no markers remain. Not the stale mattpocock `resolving-merge-conflicts` dropped at lot 33: different creator, different repo, different content. Directly applicable to any agent resolving merges. By @warpdotdev, listed here with credit to its creator. Skill Harbor never reviews the code, review it yourself before use.
Version:
Install
Prerequisites: an AI agent harness (Claude Code, Codex, Pi, Antigravity, Hermes, or Muse) and a git repo with conflicts to resolve Install "Resolve Merge Conflicts" for me. Resolve git conflicts from compact context — unresolved paths, conflict hunks, ours/base/theirs diffs Repository: https://github.com/warpdotdev/common-skills/blob/main/.agents/skills/resolve-merge-conflicts/SKILL.md 1. Fetch the SKILL.md file for the warpdotdev-resolve-merge-conflicts skill from the repository into a temporary folder and summarize what it does in one or two sentences. 2. Safety check: review the SKILL.md and scripts for anything suspicious (unexpected network calls, shell commands, credential harvesting). This repo should contain zero secrets in code, credentials only via the secure vault, allowed hosts declared in the SKILL.md. Verify that holds here; STOP on any red flag and tell me. 3. Install it as a skill: copy SKILL.md and its helper files into the agent's skills directory, in a folder named "warpdotdev-resolve-merge-conflicts". 4. Verify with no network calls: frontmatter valid, files in place. 5. Report what was installed, where, and what I still need to do myself (e.g. any accounts, API keys, or CLI tools mentioned in the prerequisites above). GitHub is optional: if I have a GitHub account or the gh CLI, you may use it; otherwise public access is fine. Never require it unless it's in the prerequisites above. Rules: don't touch anything outside the temp folder and the install target. Never ask me to paste secrets in chat — credentials go through the secure vault or environment variables. If anything looks off, stop and ask me.
Questions
How do I install a build?
Every product page includes a copy-paste install prompt. Paste it into your Muse and it sets the build up for you — no manual configuration.
Where does my money go?
Straight to the seller. Skill Harbor never processes payments: checkout happens on the seller’s own page, usually Stripe.
What does the ✓ next to a creator’s name mean?
It means we confirmed the identity of the person behind the listing. It says nothing about the code itself — always check a build before installing it.