SkillDevelopment

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.

npx skills@latest add warpdotdev/common-skills --skill '*' --agent warp --global

  • This documented command installs the whole collection globally for Warp. Some skills require Warp repositories, Oz or internal integrations.

Installation options in the README

Part of a collection

  • CollectionDevelopment

    Warp Common Skills

    Warp-oriented specifications, reviews and development workflows.

    Published by warpdotdev

    Development