Resolve Merge Conflicts skill: what it does and how to install it
Resolves Git merge, rebase, cherry-pick and stash conflicts by showing focused hunks and diffs instead of whole files.
Summary generated from the skill's documentation.
Install
$ npx skills add warpdotdev/common-skills --skill resolve-merge-conflictsRun it in a terminal. If your agent is already running, start a new session so it picks the skill up.
About this skill
What it does. Summarises unresolved paths and index stages, then extracts one file's conflict hunks, nearby context and an ours-versus-theirs diff. It supports text and index-only conflicts, rechecks markers and unmerged paths, and stages resolved files after validation.
When to use it. When Git stops during a merge, rebase, cherry-pick or stash pop, or git status shows unmerged paths. It uses targeted tests, builds or linters to validate the affected area.
History
Repo stars
598
Tracking since . A chart appears once there are 7 days of data.
Stars are counted for the whole repository, which holds 17 skills.
Installs
27k
Tracking since . A chart appears once there are 7 days of data.
Installs via skills.sh
Similar skills
- Finishing a Development BranchGuides the choice of how to integrate finished work once tests pass: merge, pull request or cleanup.
- Improve Codebase ArchitectureScans a codebase for chances to deepen modules, shows them in an HTML report, then interviews you about the one you pick.
- Migrate to ShoehornMigrates test files from `as` type assertions to @total-typescript/shoehorn.