anti-conflict
Prevent file conflicts between multiple AI agents working in parallel
conflict-resolution
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
merge-conflict-resolution
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
git-hex-conflict-resolution
>
git-safe-workflow
Safely inspect, stage, commit, and (only if asked) push changes made by an AI agent. Use for commit/push requests, end-of-task checkpoints, merge conflict resolution, worktree safety checks, or deciding whether to use git commit --amend.
git-workflow
Follow Git best practices for commits, branches, pull requests, and version control workflows. Use when making commits, creating PRs, managing branches, or resolving conflicts.
git-workflow
Manages Git operations including branching strategies, commit conventions, merge workflows, and conflict resolution. Trigger keywords: git, branch, commit, merge, rebase, PR, pull request, conflict, version control.
software-change-management-using-git
Use this skill when any task is complete, before beginning any non-trivial task, or whenever working with git or tasked with commiting code.
troubleshooting-execute
Use when execute command encounters errors - diagnostic guide for phase failures, parallel agent failures, merge conflicts, worktree issues, and recovery strategies
conflict-resolver
Smart git merge conflict resolution with context analysis, pattern detection, and automated resol...
managing-git
Manages Git workflows including branching, commits, and pull requests. Use when working with Git, creating commits, opening PRs, managing branches, resolving conflicts, or when asked about version control best practices.
