git-workflow

Git merge conflicts occur when branches modify the same lines. This Skill routes conflict resolution by loading reference guidelines, showing you the conflicting sections, and recommending strategies—status, diffs, and rebase workflows—without auto-committing changes.

Branch management and rebasing organize commits across workflows. This Skill provides reference-driven guidance on branch strategies, rebase workflows, and safe rebase operations, routing all decisions through structured recommendations before any destructive action.

Git diff and log commands expose code changes and history. This Skill centralizes guidance on reading diffs, inspecting commits, and understanding branches by formatting outputs and routing queries to appropriate references for actionable insights.

Git workflows span local repos and remote platforms like GitHub. This Skill routes operations—status, commits, branches, conflicts, code review—across both local and GitHub workflows, providing guidance that aligns with your platform without committing without permission.

References provide guardrails for safe, consistent git practices. This Skill loads reference files before responding to ensure all guidance on conflicts, rebasing, and branching strategies aligns with proven patterns and prevents unsafe commits or pushes.

Destructive git operations—commits, pushes, resets—pose risk if executed without confirmation. This Skill requires explicit permission for all write operations, routing requests through a permission check so you retain full control over when changes are applied.