Resolves Git merge conflicts by analyzing commit history and generating intelligent integration proposals for user approval.
The Git Conflict Resolver skill automates the complex process of manual merge conflict resolution within Claude Code. It intelligently analyzes branch history and the intent behind conflicting changes using git logs and merge-base data. By categorizing conflicts into trivial (automatic) and complex (judgment-based) scenarios, it provides clear diffs and logical rationales for suggested fixes. This ensures safe and accurate code integration while maintaining a reliable rollback path via standard git commands, making it indispensable for managing large-scale feature merges.
主な機能
01Built-in security warnings for sensitive files like .env, secrets, and keys.
02Interactive approval workflow with detailed diff previews and resolution logic.
03Automated conflict detection and classification across the repository.
040 GitHub stars
05History-based intent analysis using merge-base and commit logs.
06Categorization of conflicts into 'Trivial' and 'Judgment-Required' groups.
ユースケース
01Integrating upstream changes that conflict with local structural modifications.
02Resolving complex import or boilerplate conflicts across multiple files simultaneously.
03Merging feature branches into main with overlapping code changes.
