resolving-merge-conflicts
mattpocock/skills/skills/engineering/resolving-merge-conflicts
PlatformClaude CodeOpenAI Codex
Use when you need to resolve an in-progress git merge/rebase conflict.
Claude CodeOpenAI Codex
mattpocock/skills/skills/engineering/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.