# Resolving Merge Conflicts

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

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

## Install

```sh
agentstack add skill-waffleflopper-ai-tools-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. **See the current state** of the merge/rebase. Check git history, and the conflicting files.

2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Follow an explicit user request to abort. If incompatible intents leave a consequential product choice unresolved, explain that choice and ask rather than inventing behavior.

4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

5. **Finish the merge/rebase.** Stage resolved task-owned files and retain the intended changes already staged by the merge or rebase. Preserve unrelated working-tree and staged changes. Verify the staged diff contains only the intended merge or rebase changes before committing; if unrelated staged changes would enter the commit, preserve them outside that commit or ask when safe separation is unclear. If rebasing, continue the rebase process until all commits are rebased.

## Source & license

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

- **Author:** [waffleflopper](https://github.com/waffleflopper)
- **Source:** [waffleflopper/ai-tools](https://github.com/waffleflopper/ai-tools)
- **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-waffleflopper-ai-tools-resolving-merge-conflicts
- Seller: https://agentstack.voostack.com/s/waffleflopper
- 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%.