Manages and resolves git merge conflicts systematically to maintain code integrity during rebases and merges.
The Conflict Resolution skill provides Claude with a structured methodology for handling complex code collisions during git operations like rebasing, merging, and cherry-picking. It guides the AI through a multi-step process of understanding the conflict history, analyzing the intent behind opposing changes, implementing intelligent manual or automated resolutions, and verifying the results through syntax checks and unit tests. This ensures that features are integrated cleanly without losing critical logic or introducing semantic bugs that typical auto-mergers might miss.
