resolve-merge-conflicts
warpdotdev27.4k installs
Resolve Git conflicts from focused file excerpts.
What it does
Resolves Git merge conflicts using focused conflict excerpts and compact diffs, then validates and stages the resolved files.
When to use it
Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, Git reports unmerged paths, or files contain conflict markers.
How to use it
Give it a project with Git conflicts; it resolves files one at a time, checks the resolution, and stages the resolved files.
What you provide
- An existing project
Latest review
What you need · 1
Requires Python 3 to run the bundled conflict-context extraction script.
Access · 0
No additional actions listed.