Resolving Merge Conflicts

vinvcn/mattpocock-skills-zh-cn

This is a Chinese language skill that walks Claude through a methodical approach to resolving merge conflicts. It emphasizes understanding the original intent behind each change by checking commit messages, PRs, and issue tickets before making decisions. The workflow prioritizes preserving both sides' intentions when possible, runs automated checks like tests and typechecking after resolution, and explicitly tells Claude never to abort. It's part of a translated fork of Matt Pocock's skills collection with nearly 2K stars. If you work in a Chinese development environment or want Claude to take a more investigative approach to conflicts rather than just pattern matching on diff markers, this gives it a structured framework.

skills.sh installs

3.5K

GitHub stars

5.7K

last updated

Aug 21, 2026

Sponsors

Promote your product hereReach 125k+ visitors monthlyPromote your product hereReach 125k+ visitors monthlyAgent CaffeineSponsoredClose your lid, come back to finished workSnugSponsoredThe clipboard manager for the AI eraPromote your product hereReach 125k+ visitors monthlyWaxSponsoredBlock anything with supervision, without erasing your iPhonePromote your product hereReach 125k+ visitors monthlyknobsSponsoredSee your site on any phone, any day, in any language

Recommended

More Git & Pull Requests

1thermo-nuclear-reviewcursor/pluginsComprehensive security and correctness audit of a branch's changes. Use for thermo nuclear, thermonuclear, or deep review requests, or branch/PR diff audits foc2.8Kskills.sh installs

2review-and-shipcursor/pluginsReview the current branch for bugs, intent fit, and test coverage; run or write tests; commit focused work; open or update a PR.2.6Kskills.sh installs

3qodo-pr-resolverqodo-ai/qodo-skillsUse when the user wants to review Qodo PR feedback or fix code review comments. Capabilities: view issues by severity, apply fixes interactively or in batch, re2.4Kskills.sh installs

4difit-reviewyoshiko-pg/difitA skill for reviewing a specific diff and showing the findings as comments inside difit (the diff viewer). Use it to review branch diffs, commit diffs, or GitHu1.9Kskills.sh installs

5pr-feedback-quality-gatenexu-io/open-designSafely track pull request feedback, resolve review comments or merge conflicts, validate fixes, and use a read-only cross-review before committing or pushing fo1.9Kskills.sh installs

6github-triagetrailofbits/skillsTriages a repository's open GitHub issues and pull requests via the gh CLI. Optionally reviews and merges ready PRs — incrementally merging passing automated/bo1.7Kskills.sh installs