Resolve Conflicts

When you hit merge conflicts, this skill stops you from manually editing conflict markers and instead walks you through a structured resolution process. It categorizes your conflicts (imports, tests, generated files, deleted files), creates a detailed resolution plan for approval, then executes it with explanations for each decision. The approach is opinionated: prefer keeping both changes over choosing sides, always regenerate lock files instead of merging them, and back up deleted files before resolving. It's thorough to the point of being verbose, which is either exactly what you want when dealing with a hairy merge or overkill for a simple two-line conflict. Worth it if you're merging long-lived branches where guessing wrong is expensive.