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.
主要功能
01Systematic five-step resolution process: Understand, Analyze, Resolve, Verify, Continue
02Automated syntax and type checking post-resolution
03Detailed resolution summaries for pull request documentation
04Intelligent intent analysis to decide between 'ours', 'theirs', or manual merging
05Comprehensive verification including unit test execution and visual diff reviews
060 GitHub stars
使用场景
01Resolving complex conflicts when rebasing long-lived feature branches onto main
02Merging upstream changes while preserving specific local feature logic
03Identifying and fixing 'semantic conflicts' where code merges but logic breaks