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·data

merge

conflict

resolver

Run in AgentArea Browse All Skills

Also installable via skills CLI

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

Source

Repo:local

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

Related in data

electron-chromium-upgrade-electron-electron

Guide for performing Chromium version upgrades in the Electron project. Use when working on the roller/chromium/main branch to fix...

by electron

119,879

qiuzhi

指导Claude按照二哥的风格撰写求职类文章，包括公司薪资爆料、年终奖盘点、求职攻略、offer选择建议等内容。

by itwanger

16,619

awesome-ai-agents-illacloud-illa-builder

The chat will provide safety guides, equipment suggestions, reviews, and techniques, with context-driven summary and multimedia to...

by illacloud

12,356