resolving-merge-conflicts
Helps your agent resolve conflicts when code is updated. It's essential for ensuring changes are integrated correctly.
What it does
This tool helps resolve conflicts that occur when you try to merge different versions of code. It guides you to understand the changes and combine them correctly.
When to use it
- ✓When Git warns about conflicts after trying to merge code.
- ✓When checking which files have issues and what changed in each.
- ✓When you need to decide which code version to keep or how to combine both.
Example of what to ask your AI
“I have Git conflicts, help me resolve them.”
Want more? Open the sections below.
How to use
The easiest way: copy the message below and paste it into Claude, ChatGPT, Cursor or any AI. It reads the skill and follows the instructions.
Skill link
Ready-to-paste message
How it works
The tool analyzes the current state of your code, understands the changes causing the conflict by reading messages and history, and helps you decide how to combine the parts, preserving the main goal. Then, it checks if everything still works and finalizes the process.
Installation
Easiest way: copy the skill link and paste it into Claude, ChatGPT or Cursor asking it to follow the instructions.
In the terminal (Claude Code, Codex, Cursor), in your project folder:
npx skills add sickn33/agentic-awesome-skills --skill resolving-merge-conflictsOr download just the file:
curl -L https://raw.githubusercontent.com/sickn33/agentic-awesome-skills/main/plugins/agentic-awesome-skills-claude/skills/resolving-merge-conflicts/SKILL.md -o SKILL.mdTechnical content (original SKILL.md)
Original text by the author, straight from GitHub.
When to Use
Use when you need to resolve an in-progress git merge/rebase conflict.
See the current state of the merge/rebase. Check git history, and the conflicting files.
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.
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.Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. 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.
FAQ
What is a merge/rebase conflict?
It's when Git cannot automatically combine two versions of code because they modified the same parts in different ways.
What does 'resolve each hunk' mean?
A 'hunk' is a block of code with changes. Resolving means deciding which version of that block to keep or how to combine both.
Why shouldn't I invent new behavior?
The goal is to merge the original intentions of the changes, not create something new. Inventing can break what already worked or go against the project's objective.
Details
Original description by the author
Use when you need to resolve an in-progress git merge/rebase conflict.
Popularity
- GitHub stars
- 48k
- Ranking position
- #4009
- License
- MIT
- Updated
- 10/15/2026
Comments
- …
More skills from this repository
00-andruia-consultant
Helps your agent start or improve AI projects. It analyzes code, suggests tools, and creates action plans in Spanish.
sickn33/agentic-awesome-skills
007
Lets your agent perform security audits and threat modeling. It's useful for protecting projects against attacks and vulnerabilities.
sickn33/agentic-awesome-skills
10-andruia-skill-smith
Helps your agent create or improve AI tools. It defines how tools work, writes documentation, and validates the structure.
sickn33/agentic-awesome-skills
20-andruia-niche-intelligence
Lets your agent create a summary about a specific industry. It's useful for understanding the context, rules, usage patterns, and risks of a project, using reliable sources.
sickn33/agentic-awesome-skills
Similar skills
bun-runtime
Has your agent use Bun to run, organize, and test code. It helps choose Bun over other tools and migrate existing projects.
affaan-m/ECC
database-migrations
Helps your agent make safe changes to databases. It ensures changes can be undone and minimizes downtime.
affaan-m/ECC
deployment-patterns
Sets up deployment and CI/CD workflows, containerization, and rollback strategies to ensure safe releases.
affaan-m/ECC