Resolving merge conflicts
Skill toRolex/rolex-skills/skills/engineering/resolving-merge-conflicts
AI 编程技能合集——让 Claude Code 听懂中文、帮你干活。基于 mattpocock/skills 改编并补充了原创工具。
npx -y skills add toRolex/rolex-skills --skill resolving-merge-conflictsAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
2 things to look at
- 23 days oldThe repository was created 23 days ago. New is not bad, but a brand new repository carrying a familiar-sounding name is the shape a typosquat arrives in, and there has been no time for anyone else to find a problem with it.
- 0 stars0 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
当你需要解决进行中的 git merge/rebase 冲突时使用。
SKILL.md
1.2 KB, 377 tokens by cl100k_base, as published. Nobody here has run it
Resolving Merge Conflicts（解决合并冲突）
术语约定： 以下关键术语保持固定译法，含英文源词以便对照：
English 中文 merge/rebase合并/rebase primary sources一手资料 hunkhunk
-
查看当前状态——合并/rebase 的状态。检查 git 历史和冲突文件。
-
找到每个冲突的一手来源。深入理解每个变更为什么被做出，以及原始意图是什么。阅读 commit 消息，检查 PR，检查原始 issue/tickets。
-
解决每个 hunk。 尽可能保留两个意图。在不可兼得时，选择与合并声明目标一致的那个，并记录权衡。不要发明新行为。始终解决；永远不要
--abort。 -
发现项目的自动检查并运行它们——通常是类型检查，然后测试，然后格式化。修复合并引入的任何问题。
-
完成合并/rebase。 暂存所有内容并提交。如果是 rebasing，继续 rebase 过程直到所有 commits 都被 rebase 完成。
What ships with it
Read from the repository
Just SKILL.md. No reference files, no scripts.
Gives 0 of the 12 instructions most pr commit review skills give in 377 tokens
Counted across 888 of the 1,342 authors here whose files we hold, read 2026-08-07
- use conventional commits formatin 127 of 888, across 115 files
- keep subject line under 72 charactersin 62 of 888, across 48 files
- delete branches after mergein 51 of 888, across 38 files
- use imperative mood in subject linein 51 of 888, across 42 files
- use imperative mood in commit messagesin 44 of 888
- verify directory is ignored before creating worktreein 43 of 888, across 12 files
- generate a conventional commit messagein 43 of 888
- add unignored worktree directories to gitignorein 42 of 888, across 10 files
- make atomic commitsin 39 of 888, across 27 files
- run tests before committingin 36 of 888, across 25 files
- verify clean test baselinein 35 of 888, across 9 files
- split unrelated changes into separate commitsin 35 of 888, across 30 files
Said here and by no other author read
- check merge and rebase state
- review git history and conflicting files
- find primary sources for each conflict
- understand original change intent
- match the stated merge goal
- record tradeoffs for rejected changes
Grouped from the skills themselves: near-identical wordings counted once, and counted by distinct author, so one author publishing three of these counts once. Length counted with cl100k_base; the agent that loads this file may tokenize it differently.