# Resolving Merge Conflicts

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

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

## Install

```sh
agentstack add skill-toverux-grimoire-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, and check any specs in `docs/specs/` behind each change.

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.
   Always resolve; never `--abort`.

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 everything and commit.
   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:** [toverux](https://github.com/toverux)
- **Source:** [toverux/grimoire](https://github.com/toverux/grimoire)
- **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-toverux-grimoire-resolving-merge-conflicts
- Seller: https://agentstack.voostack.com/s/toverux
- 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%.