git-workflow
Installation
SKILL.md
Git Workflow
Purpose
Produce an executable, safety-first plan for Git history, branches, commits, rebases, merges, conflict recovery, and dependent PRs without executing commands.
Workflow
- Inspect repository state, branch publication status, remotes, and collaboration constraints; do not assume a branch is private.
- Define the logical change and branch/stack topology, then choose atomic commit boundaries and a Conventional Commit message.
- Select rebase or merge using shared-history and collaboration criteria; document conflict-resolution order for dependent branches.
- Build ordered operations with exact commands, a risk tier (
safe,cautious, ordestructive), rationale, and verification checkpoints. - Apply the history-safety and recovery rules before any rewrite, conflict recovery, or stack update.
- Review the diff for unrelated files, secrets, generated debris, and accidental history changes before publication.
Output Contract
Return a plan using assets/templates/output.md with: