resolving-merge-conflicts

mattpocock/skills/skills/engineering/resolving-merge-conflicts

255.5k 0 +15.0k/7dShellAutomation
PlatformClaude CodeOpenAI Codex

Use when you need to resolve an in-progress git merge/rebase conflict.

Claude CodeOpenAI Codex

All Skills