resolving-merge-conflicts – Coding skill for AI agents
Use when you need to resolve an in-progress git merge/rebase conflict.
Install the resolving-merge-conflicts skill with one command
Pick the tool you use, copy the command and paste it in your terminal. The skill lands in that tool's skills folder and is ready in your next session.
Claude Code
mkdir -p ~/.claude/skills && curl -fsSL https://skill.dn1nguoi.com/z/resolving-merge-conflicts-296cf.tgz | tar xz -C ~/.claude/skills
Call it in Claude Code: /resolving-merge-conflicts – then describe the task you want done.
Codex
mkdir -p ~/.codex/skills && curl -fsSL https://skill.dn1nguoi.com/z/resolving-merge-conflicts-296cf.tgz | tar xz -C ~/.codex/skills
Call it in Codex: $resolving-merge-conflicts – then describe the task you want done.
Hermes Agent
mkdir -p ~/.hermes/skills && curl -fsSL https://skill.dn1nguoi.com/z/resolving-merge-conflicts-296cf.tgz | tar xz -C ~/.hermes/skills
Call it in Hermes Agent: /resolving-merge-conflicts – then describe the task you want done.
DeepSeek
mkdir -p ~/.deepcode/skills && curl -fsSL https://skill.dn1nguoi.com/z/resolving-merge-conflicts-296cf.tgz | tar xz -C ~/.deepcode/skills
Call it in DeepSeek: /resolving-merge-conflicts – then describe the task you want done.
SKILL.md content
When to Use
Use when you need to resolve an in-progress git merge/rebase conflict.
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. If the intents cannot be reconciled from evidence, preserve the conflicted state and explain the unresolved choice. Honor a user-requested abort after checking what it would restore.
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 only the reviewed conflict resolutions, inspect the staged diff for unrelated work, and commit within the authorized scope and repository policy. If rebasing, continue the rebase process until all commits are rebased.
Example
User request:
> Use @resolving-merge-conflicts for this task: Use when you need to resolve an in-progress git merge/rebase conflict.
Limitations
- Use this skill only when the task clearly matches its upstream source and local project context.
- Verify commands, generated code, dependencies, credentials, and external service behavior before applying changes.
- Do not treat examples as a substitute for environment-specific tests, security review, or user approval for destructive or costly actions.
Related skills
- review-and-simplify-changes – Review a git diff or explicit file scope for reuse, code quality, efficiency, clarity…
- review-animations – Use when reviewing animation and motion code against a strict craft, performance…
- review-response-generator – Review Response Generator. Use when working with review text and verified business…
- review-swarm – Parallel read-only multi-agent review of a current git diff or explicit file scope to…
- robius-app-architecture – CRITICAL: Use for Robius app architecture patterns. Triggers on: Tokio, async…
- robius-matrix-integration – CRITICAL: Use for Matrix SDK integration with Makepad. Triggers on: Matrix SDK, sliding…
- robot-framework-skill – Generates Robot Framework tests in keyword-driven syntax with Python. Supports…
- robots-txt-validator – Robots.txt Validator. Use when working with robots.txt text, crawler and URLs to test.