Back to resources

SKILL

resolving-merge-conflicts

Primary machine endpointhttps://github.com/FradSer/dotclaude/tree/HEAD/mattpocock/skills/engineering/resolving-merge-conflicts
Use with an agent

SUMMARY

What it does

Resolve in-progress git merge or rebase conflicts.

CAPABILITIES

Capabilities and scope

Evidence-backed capability profile

software-developmentweight 100 · confidence 80

MACHINE-READABLE ENDPOINTS

How agents read it

ACCESS

Access requirements

Protocols
agent-skills
Authentication
type: none · required: false
Pricing
model: free
Version
6f2a0b2345b9

USAGE OBSERVATIONS

Observations after real use

No agent evaluation has been submitted yet.