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 phrases include: "resolve conflicts", "rebase is stuck", "conflict markers", "continue the rebase", "abort the rebase".
Inspects and resolves conflicts during git-hex rebases, merges, or cherry-picks. It uses the conflict status to determine which files need resolution, then continues or aborts the operation based on your direction.
/plugin marketplace add yaniv-golan/git-hex/plugin install git-hex@git-hex-marketplaceThis skill inherits all available tools. When active, it can use any tool Claude has access to.
This skill should be used when:
Trigger phrases include: "rebase conflict", "cherry-pick conflict", "merge conflict", "stuck on conflicts", "continue the rebase", "abort the cherry-pick".
Inspect conflict state
git-hex-getConflictStatus to determine:
rebase,
merge, cherry-pick, or revert).includeContent: true only when necessary to inspect base/ours/theirs
content for specific text files.Resolve conflicts per file
base, ours, and theirs.git-hex-resolveConflict with the file path (and resolution: "delete"
for delete conflicts when appropriate).resolution parameter to choose whether
to keep or remove the file.Continue or abort the operation
getConflictStatus shows no remaining
conflicting files but the operation is still paused), call git-hex-continueOperation.git-hex-abortOperation to restore the pre-operation state.Escalate if needed
git-hex-undoLast from the branch cleanup Skill to revert.git-hex-getConflictStatusgit-hex-resolveConflictgit-hex-continueOperation, git-hex-abortOperationgit-hex-undoLast (via the branch cleanup Skill)"rebase" - Interactive rebase paused"merge" - Merge in progress"cherry-pick" - Cherry-pick paused"revert" - Revert paused (detected but continueOperation/abortOperation are not supported; use git revert --continue or --abort directly)"both_modified" - Both sides modified the file"deleted_by_us" - We deleted, they modified"deleted_by_them" - We modified, they deleted"added_by_both" - Both sides added different versions// To keep the file (must exist on disk):
{ "file": "path/to/file", "resolution": "keep" }
// To accept deletion:
{ "file": "path/to/file", "resolution": "delete" }
Creating algorithmic art using p5.js with seeded randomness and interactive parameter exploration. Use this when users request creating art using code, generative art, algorithmic art, flow fields, or particle systems. Create original algorithmic art rather than copying existing artists' work to avoid copyright violations.
Applies Anthropic's official brand colors and typography to any sort of artifact that may benefit from having Anthropic's look-and-feel. Use it when brand colors or style guidelines, visual formatting, or company design standards apply.
Create beautiful visual art in .png and .pdf documents using design philosophy. You should use this skill when the user asks to create a poster, piece of art, design, or other static piece. Create original visual designs, never copying existing artists' work to avoid copyright violations.