How to use
- Copy the installation command and review the source package before installing it in your own agent environment.
- Check the source document for required tools, credentials and supported hosts.
- Describe your input and desired deliverable; review the output against the source material.
npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflictsBefore you start
- Installation does not include a model subscription, API allowance or permission to access your files.
- Repository stars and installation counts describe activity, not an independent quality or security test.
Original skill document
Rendered from the source repository. Headings, examples, code, tables, links, and referenced images are preserved.
- 查看当前 merge/rebase 状态。检查 git history 和冲突文件。
- 为每个冲突找到 primary sources。深入理解每个变更为什么产生，以及原始意图是什么。阅读 commit messages，检查 PRs，检查原始 issues/tickets。
- 解决每个 hunk。 尽可能保留双方意图。若二者不兼容，选择符合本次 merge 目标的一方，并记录 trade-off。不要发明新行为。始终解决冲突；不要
--abort。
- 发现项目的 automated checks 并运行它们，通常是 typecheck、tests、format。修复 merge 引入的问题。
- 完成 merge/rebase。 Stage 所有内容并 commit。若正在 rebase，继续 rebase 流程直到所有 commits 都完成。
