Resolving Merge Conflicts
在你需要解决一个进行中的 git merge/rebase 合并冲突时使用。
— No reviews yet
0 installs
13 views
0.0% view→install
Install
$ agentstack add skill-wenwuzhidao-mattpocock-skills-zh-resolving-merge-conflicts ✓ scanned · ✓ verified — works with Claude Code, Cursor, and more.
Security review
✓ PassedNo issues found. Passed automated security review. · v0.1.0 How review works →
- ✓ Prompt-injection patterns
- ✓ Secret / credential exfiltration
- ✓ Dangerous shell & filesystem operations
- ✓ Untrusted network calls
- ✓ Known-malicious package signatures
What it can access
- ✓ Network access No
- ✓ Filesystem access No
- ✓ Shell / process execution No
- ✓ Environment & secrets No
- ✓ Dynamic code execution No
From automated source analysis of v0.1.0. “Used” means the capability is present in the source — more access means more to trust, not that it’s unsafe.
Are you the author of Resolving Merge Conflicts? Claim this listing to set pricing, connect Stripe payouts, and keep 70% of every sale.
Sign up to claimAbout
- 查看 merge/rebase 的当前状态。检查 git 历史，以及有冲突的文件。
- 为每个冲突找到主要来源。深入理解每处变更为何做出，以及原始意图是什么。阅读 commit 消息、查看 PR、查看原始的 issue/工单。
- 解决每个 hunk。 在可能之处保留双方的意图。当不兼容时，选择与本次 merge 所声明目标相符的那个，并记下权衡。不要 发明新行为。始终解决冲突；永不
--abort。
- 发现项目的 自动化检查 并运行它们——通常是类型检查，然后测试，然后格式化。修复 merge 破坏的任何东西。
- 完成 merge/rebase。 暂存所有内容并提交。如果是 rebase，继续 rebase 过程，直到所有 commit 都完成 rebase。
Source & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: WenWuZhiDao
- Source: WenWuZhiDao/mattpocock-skills-zh
- License: MIT
Install and usage instructions live in the source repository linked above.
Reviews
No reviews yet — be the first.
Write a review
Versions
- v0.1.0 Imported from the upstream source.