resolving-merge-conflicts
Helps you fix code conflicts when merging or rebasing in git.
Installation
Paste this into Claude Code, Cursor, or any agent that can run commands.
What this skill does
What it does:
- Helps you fix conflicts when two versions of code try to merge together
- Finds the original reason each change was made
- Keeps both sides of the change if possible
- Runs tests to make sure the merge works
- Finishes the merge when everything is fixed
When to use it:
- When you are merging or rebasing code and git shows conflicts
- When two people changed the same part of a file
- When you need to understand why each change was made before deciding which to keep
The full skill text could not be loaded right now. It installs fine with the command above, or read it at the source.
Mirrored from the author's public source. Install counts from the open skills registry.