πŸ”Œ

mattpocock-skills-resolving-merge-conflicts

πŸ”ŒPlugin

StudentSuite/awesome-skills-plugins-for-students

Installation

Add marketplace in Claude Code:
$/plugin marketplace add StudentSuite/awesome-skills-plugins-for-students
Step 2. Install plugin:
$/plugin install mattpocock-skills-resolving-merge-conflicts@awesome-skills-plugins-for-students
VibeIndex|
What it does
|

Walks through resolving an in-progress git merge or rebase conflict step by step.

πŸͺ

Part of

StudentSuite/awesome-skills-plugins-for-students

0
-
AddedSep 12, 2026