git-hex-conflict-resolution
This skill should be used when the user is stuck in a git-hex-driven rebase, merge, or cherry-pick due to conflicts and wants the agent to inspect, resolve, and then continue or abort safely. Trigger
git
hex
conflict
resolution
Also installable via skills CLI
npx skills add yaniv-golan/git-hex/development/git-hex-conflict-resolution