Resolves complex Git merge conflicts during rebases, merges, and cherry-picks with automated marker validation.
The Git Conflict Resolver skill streamlines the often tedious process of handling code collisions by providing Claude with specialized context scripts and safety hooks. It allows for advanced three-way merge analysis—accessing Base, Ours, and Theirs versions of files—and utilizes Git's 'rerere' functionality to automate repeated resolutions. A critical safety feature includes an automated check that prevents continuing a rebase or merge if conflict markers remain in the codebase, ensuring a clean and functional commit history.
Key Features
01Enhanced Git context gathering for rebase and cherry-pick scenarios
02Three-way merge access to Base, Ours, and Theirs file versions
03Support for Git 'rerere' to reuse previous conflict resolutions
04Automated conflict marker detection and validation via pre-commit hooks
055 GitHub stars
06Integrated status and context scripts for deeper conflict analysis
Use Cases
01Resolving complex merge conflicts across multiple files during a rebase
02Safely finalizing cherry-picks by ensuring all markers are removed before continuing
03Managing three-way merges by comparing common ancestors with incoming changes
