# Resolving Merge Conflicts

> Use when you need to resolve an in-progress git merge/rebase conflict.

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

## Install

```sh
agentstack add skill-officialunofficial-skills-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. **Read the current state** of the merge or rebase. Inspect the git history and the files that conflict.

2. **Trace each conflict back to its source.** Understand fully why each side made its change and what it was trying to achieve — read the commit messages, look at the PRs, follow the originating issues/tickets.

3. **Resolve every hunk.** Keep both intents wherever they can coexist. Where they can't, take the side that matches the merge's stated goal and record the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.

4. Find the project's **automated checks** and run them — usually typecheck first, then tests, then format. Repair whatever the merge broke.

5. **Complete the merge/rebase.** Stage everything and commit. If you're rebasing, keep continuing until every commit is replayed.

## Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

- **Author:** [officialunofficial](https://github.com/officialunofficial)
- **Source:** [officialunofficial/skills](https://github.com/officialunofficial/skills)
- **License:** Apache-2.0

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-officialunofficial-skills-resolving-merge-conflicts
- Seller: https://agentstack.voostack.com/s/officialunofficial
- 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%.