# Resolving Merge Conflicts

> 在你需要解决一个进行中的 git merge/rebase 合并冲突时使用。

- **Type:** Skill
- **Install:** `agentstack add skill-wenwuzhidao-mattpocock-skills-zh-resolving-merge-conflicts`
- **Verified:** Yes — security-reviewed for prompt injection and unsafe behavior
- **Seller:** [WenWuZhiDao](https://agentstack.voostack.com/s/wenwuzhidao)
- **Installs:** 0
- **Category:** [Agent Skills](https://agentstack.voostack.com/c/agent-skills)
- **Latest version:** 0.1.0
- **License:** MIT
- **Upstream author:** [WenWuZhiDao](https://github.com/WenWuZhiDao)
- **Source:** https://github.com/WenWuZhiDao/mattpocock-skills-zh/tree/main/skills/engineering/resolving-merge-conflicts

## Install

```sh
agentstack add skill-wenwuzhidao-mattpocock-skills-zh-resolving-merge-conflicts
```

Requires the [AgentStack CLI](https://agentstack.voostack.com/docs/cli). Works with Claude Code, Cursor, and any MCP-compatible agent.

## About

1. **查看 merge/rebase 的当前状态**。检查 git 历史，以及有冲突的文件。

2. **为每个冲突找到主要来源**。深入理解每处变更为何做出，以及原始意图是什么。阅读 commit 消息、查看 PR、查看原始的 issue/工单。

3. **解决每个 hunk。** 在可能之处保留双方的意图。当不兼容时，选择与本次 merge 所声明目标相符的那个，并记下权衡。**不要** 发明新行为。始终解决冲突；永不 `--abort`。

4. 发现项目的 **自动化检查** 并运行它们——通常是类型检查，然后测试，然后格式化。修复 merge 破坏的任何东西。

5. **完成 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](https://github.com/WenWuZhiDao)
- **Source:** [WenWuZhiDao/mattpocock-skills-zh](https://github.com/WenWuZhiDao/mattpocock-skills-zh)
- **License:** MIT

Install and usage instructions live in the source repository linked above.

## Pricing

- **Free** — Free

## Security capabilities

Automated source analysis of v0.1.0 — what this tool can access:

- **Network access:** no
- **Filesystem access:** no
- **Shell / process execution:** no
- **Environment & secrets:** no
- **Dynamic code execution:** no

*"Yes" means the capability is present in the source — more access means more to trust, not that it is unsafe.*


## Versions

- **0.1.0** — security scan: passed — Imported from the upstream source.

## Links

- Listing page: https://agentstack.voostack.com/l/skill-wenwuzhidao-mattpocock-skills-zh-resolving-merge-conflicts
- Seller: https://agentstack.voostack.com/s/wenwuzhidao
- Browse the marketplace: https://agentstack.voostack.com/browse

---
Listed on AgentStack — the marketplace for AI agent skills and MCP servers. Every listing is security-reviewed. Creators keep 70%.