Каталог скиллов
[ DevOps ]
mattpocock-resolving-merge-conflicts
v1.0.0 · git
Описание
Work through a git merge or rebase conflict hunk by hunk, resolving by intent traced to each side's primary source, then finishing the operation
Ключевые слова
#git#merge#conflicts#rebase#mattpocock
Установка
⚡ Универсально (npx)Claude Code · Cursor · Codex · OpenCode · Gemini
$ npx skills add mattpocock/skills --skill skills/engineering/resolving-merge-conflictsClaude Code
$ /plugin marketplace add mattpocock-resolving-merge-conflictsGit clone (вручную)
$ git clone https://github.com/mattpocock/skills.git