merge-conflict-resolver

Analyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters.

by auldsyababua· Repository·design

merge

conflict

resolver

Run in AgentArea Browse All Skills

Also installable via skills CLI

npx skills add auldsyababua/instructor-workflow/design/merge-conflict-resolver

Source

Repo:local

Path:design/merge-conflict-resolver(main)

Related in design

add-uint-support

Add unsigned integer (uint) type support to PyTorch operators by updating AT_DISPATCH macros. Use when adding support for uint16,...

skill-writer

Guide users through creating Agent Skills for Claude Code. Use when the user wants to create, write, author, or design a new Skill...

frontend-design

Create distinctive, production-grade frontend interfaces with high design quality. Use this skill when the user asks to build web...