resolve-merge-conflicts
Resolve Git merge and rebase conflicts.
MIT licence
What it does
Resolves Git merge and rebase conflicts by isolating changed paths and conflict hunks before making focused fixes.
Installation
This command adds the whole Warp Common Skills collection, which includes resolve-merge-conflicts.
- This documented command installs the whole collection globally for Warp. Some skills require Warp repositories, Oz or internal integrations.
Part of a collection
-
Development
Warp Common Skills
Warp-oriented specifications, reviews and development workflows.
Published by warpdotdev