GoogleKnown publishergoogle/tf-remote-vars/.github/skills/mattpocock/engineering/resolving-merge-conflicts/SKILL.mdresolving-merge-conflicts
Skill1 starsChanged 3 months agoApache-2.0View on GitHub
Use when you need to resolve an in-progress git merge/rebase conflict.
Files
- 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.
Other versions138 projects use a version of this.
Word for word · 53
- bestofjs/bestofjs★ 3.1k100% same
- aws/graph-explorer★ 489100% same
- udecode/better-convex★ 452100% same
- hcloud-talos/terraform-hcloud-talos★ 362100% same
- biersoeckli/QuickStack★ 361100% same
- ninehills/skills★ 280100% same
- loulanyue/skills★ 231100% same
- ahonn/dotfiles★ 62100% same
- lezli01/vincent★ 28100% same
- julianromli/faiz-skills★ 16100% same
43 more not listed
Edited · 68
- QuivrHQ/quivr★ 40k100% same
- crbnos/carbon★ 2.8k100% same
- CelestoAI/SmolVM★ 1k85% same
- moeru-ai/xsai★ 664100% same
- tt-a1i/matt-skills-with-to-goal★ 18584% same
- iamyoki/qwen-image-2.1-skill★ 116100% same
- Dimon94/dverity★ 107100% same
- Dimon94/skills★ 107100% same
- VoDaiLocz/kilo-kit-mcp★ 26100% same
- applypack/applypack★ 2177% same
58 more not listed
Wrote their own version · 17
- nodetool-ai/nodetool★ 588same name
- stevesolun/ctx★ 583same name
- GGGODLIN/gggodlin-cc-harness★ 71same name
- WenWuZhiDao/mattpocock-skills-zh★ 27same name
- imMamdouhaboammar/matts-skills-into-chatgpt★ 8same name
- dekoza/oh-my-slop★ 4same name
- icetomoyo/CodingSkills★ 4same name
- KroxiDev/engineering-skills★ 4same name
- stenalpjolly/llm-skills★ 4same name
- luizomf/omskills★ 3same name
7 more not listed
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
Used alongsideProjects with it also use setup-ts-deep-modules, decision-mapping and 10 more.
Other files people use alongside this one.
Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
liufeng1976Skillsetup-ts-deep-modules
Wire dependency-cruiser into a TypeScript repo so each package is a deep module — implementation hidden in subfolders, reachable only through its entry-point files. User-invoked.
Also in 23 projects that use this
FabienDehopreSkilldecision-mapping
Turn a loose idea into a sequenced map of investigation tickets, then drive them to resolution one at a time.
Also in 5 projects that use this
RoentekSkillloop-me
Grill me about specs for the workflows I want to build, within this workspace.
Also in 28 projects that use this
ryotaroh180105Skillclaude-handoff
Hand the current conversation off to a fresh background agent that picks up the work immediately.
Also in 23 projects that use this
AWSSkillto-questionnaire
Turn a decision you can't fully answer into a questionnaire for someone else to fill in.
Also in 46 projects that use this
- AWSSkill
wizard
Generate an interactive bash wizard that walks a human through steps only they can perform. Use when provisioning infrastructure, setting up credentials or CI secrets, walking an unfamiliar third-party dashboard, or running a one-off migration or cutover. Don't invoke this for steps the agent can perform itself.
Also in 60 projects that use this
In this repository29 other files it gives its agents.
- ask-mattSkill
- codebase-designSkill
- code-reviewSkill
- diagnosing-bugsSkill
- domain-modelingSkill
- grill-with-docsSkill
- implementSkill
- improve-codebase-architectureSkill
- prototypeSkill
- researchSkill
- setup-matt-pocock-skillsSkill
- tddSkill
- to-issuesSkill
- to-prdSkill
- to-specSkill
- to-ticketsSkill
- triageSkill
- wayfinderSkill
- grillingSkill
- grill-meSkill
- handoffSkill
- teachSkill
- writing-great-skillsSkill
- ponytail-auditSkill
- ponytail-debtSkill
- ponytail-gainSkill
- ponytail-helpSkill
- ponytail-reviewSkill
- ponytailSkill
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
Reviews can't be read right now.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.