Manages and resolves complex Git merge, rebase, and cherry-pick conflicts within the git-hex workflow.
The git-hex-conflict-resolution skill empowers Claude to intelligently navigate Git states when a rebase, merge, or cherry-pick operation is paused due to conflicts. It provides a structured workflow to inspect conflict statuses, analyze 'ours' versus 'theirs' content, and automate resolution strategies for both text and file-level conflicts. By utilizing specialized tools to resolve, continue, or abort operations, this skill ensures that developers can move past blockers quickly while maintaining a clean and accurate version control history.
Key Features
01Automated inspection of conflict states across rebases, merges, and cherry-picks
02Integration with undo capabilities for post-resolution recovery
03Context-aware resolution of 'both_modified' text conflicts
04Safe operation control to continue or abort paused Git processes
05Specialized handling for 'deleted_by_us' and 'deleted_by_them' file conflicts
060 GitHub stars
Use Cases
01Safely aborting or continuing cherry-pick operations with granular file control
02Resolving complex interactive rebases that get stuck on multiple commits
03Automating the resolution of repetitive merge conflicts across large feature branches
