How does it handle files that were deleted on one side?

The skill can detect 'deleted_by_us' or 'deleted_by_them' conflicts and allows you to choose whether to keep the file or accept the deletion.

Can I abort a rebase if the conflicts are too complex?

Yes, the skill includes a specific operation to safely abort the current process and restore your repository to its pre-operation state.

What Git operations does this skill support?

This skill is designed to handle conflicts arising from interactive rebases, merges, and cherry-pick operations within the git-hex environment.

Does it remove Git conflict markers automatically?

Yes, the resolution workflow ensures that standard Git conflict markers are removed and the file is properly marked as resolved before continuing.

Git-hex Conflict Resolver

Name: Git-hex Conflict Resolver
Author: yaniv-golan

byyaniv-golan

部署与 DevOps

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.

主要功能

Automated inspection of conflict states across rebases, merges, and cherry-picks
Integration with undo capabilities for post-resolution recovery
Context-aware resolution of 'both_modified' text conflicts
Safe operation control to continue or abort paused Git processes
Specialized handling for 'deleted_by_us' and 'deleted_by_them' file conflicts
0 GitHub stars

使用场景

Safely aborting or continuing cherry-pick operations with granular file control
Resolving complex interactive rebases that get stuck on multiple commits
Automating the resolution of repetitive merge conflicts across large feature branches

关于

主要功能

Automated inspection of conflict states across rebases, merges, and cherry-picks
Integration with undo capabilities for post-resolution recovery
Context-aware resolution of 'both_modified' text conflicts
Safe operation control to continue or abort paused Git processes
Specialized handling for 'deleted_by_us' and 'deleted_by_them' file conflicts
0 GitHub stars

使用场景

Safely aborting or continuing cherry-pick operations with granular file control
Resolving complex interactive rebases that get stuck on multiple commits
Automating the resolution of repetitive merge conflicts across large feature branches