Resolving Merge Conflicts

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.

Install to Claude Code

npx -y skills add vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflicts --agent claude-code