resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Install / Use
npx skills add mattpocock/skills --skill resolving-merge-conflictsInstalls into whichever agent you are using.
SKILL.md
Installable skill definition
Quality Score
Category
Development & EngineeringSupported Platforms
Our assessment of resolving-merge-conflicts
resolving-merge-conflicts scores 87/100 on our quality scale, 365th of 1,751 Development & Engineering skills we index (top 21%).
Its SKILL.md is 918 bytes long, written without headings and no code examples: fairly brief, so expect to fill in details yourself.
With 268,790 GitHub stars, it is one of the more widely adopted skills in the catalogue.
Maintenance, license and trust
- The repository was last updated yesterday, so resolving-merge-conflicts is actively maintained.
- It is released under the MIT license, a permissive license that allows use, modification and commercial use with attribution.
- Its trust signals score 100/100, with no cautions. These come from repository metadata, not a code audit — read the skill file before letting an agent act on it.
resolving-merge-conflicts compared with similar skills
All 4 of these similar skills score higher than resolving-merge-conflicts; compare them before choosing.
| Skill | Score | Stars | Updated | Format |
|---|---|---|---|---|
| resolving-merge-conflicts (this skill)by mattpocock | 87 | 268.8k | 1d ago | SKILL.md |
| Agent-Reachby Panniantong | 100 | 85.4k | 9d ago | CLAUDE.md |
| ai-job-searchby MadsLorentzen | 100 | 43.9k | 4d ago | CLAUDE.md |
| claude-howtoby luongnv89 | 100 | 41.7k | 5d ago | CLAUDE.md |
| algorithmic-artby anthropics | 100 | 177.9k | 2d ago | SKILL.md |
Frequently asked questions
- How do I install resolving-merge-conflicts?
- Run
npx skills add mattpocock/skills --skill resolving-merge-conflicts. The install tabs above show the steps for each supported agent. - Which AI agents does resolving-merge-conflicts work with?
- It is written for Universal, as a SKILL.md file. Other agents that read the same format can often use it too.
- Is resolving-merge-conflicts safe to use?
- It is MIT-licensed and scores 100/100 on trust signals. Skills are instructions an agent will follow, so read the file before installing it and do not approve commands you do not understand.
- Is resolving-merge-conflicts still maintained?
- The repository was last updated yesterday, so resolving-merge-conflicts is actively maintained.
Skill content
View source on GitHubname: resolving-merge-conflicts description: "Use when you need to resolve an in-progress git merge/rebase conflict."
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
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.
-
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. -
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Related Skills
Agent-Reach
85.4kGive your AI agent eyes to see the entire internet. Read & search Twitter, Reddit, YouTube, GitHub, Bilibili, XiaoHongShu — one CLI, zero API fees.
ai-job-search
43.9kThe job search that runs on your machine. AI job application framework built on Claude Code: evaluate postings, tailor CVs, write cover letters, prep interviews. Fork it and own it.
claude-howto
41.7kA visual, example-driven guide to Claude Code — from basic concepts to advanced agents, with copy-paste templates that bring immediate value.
algorithmic-art
177.9kCreating algorithmic art using p5.js with seeded randomness and interactive parameter exploration. Use this when users request creating art using code, generative art, algorithmic art, flow fields, or particle systems.
Languages
Trust signals
From repository metadata: license, adoption, age and documentation. Not a code audit — see the Safety scan above for what the skill file itself contains.