agentsclimarketplace
Sign in

Resolving merge conflicts

Skill adriannoes/awesome-agentic-ai/cursor-claude-codex/skills/matt-pocock/engineering/resolving-merge-conflicts

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

Install
npx -y skills add adriannoes/awesome-agentic-ai --skill resolving-merge-conflicts

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

SKILL.md

0.9 KB, 178 tokens by cl100k_base, as published. Nobody here has run it

  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 ships with it

Read from the repository

Just SKILL.md. No reference files, no scripts.

Keep looking

Skills are one crate of 325,949. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.