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