git-feature-workflow

Git Feature Workflow

Mission

Guide normal development branches from creation through PR/MR merge into the configured integration branch.

Startup

1. Read .git-workflow.yml.
2. Resolve shared resources from ${CLAUDE_PLUGIN_ROOT}/shared; if running outside Claude Code, use the nearest ancestor containing git-workflow-skills.yml.
3. Inspect git status --short --branch, git branch -vv, and git remote -v.
4. Check whether the current task belongs to normal development; hand off release or hotfix work.

Inputs

• Work type: feature, fix, docs, refactor, test, build, ci, or chore.
• Short topic name.
• Current branch and integration branch.
• Whether changes already exist.

Workflow

1. Confirm the integration branch from config.
2. If starting new work, switch to the integration branch, pull latest, and create <prefix>/<topic>.
3. Validate branch naming with check_branch_name.py.
4. If changes exist, check forbidden files.
5. If the diff is complex, hand off to git-commit-discipline.
6. After user confirmation, commit, push, and create PR/MR to the integration branch.
7. Wait for CI when available.
8. Merge only after the user confirms.

Safety Gates

git add, git commit, git push, PR/MR creation, PR/MR merge, and branch deletion require confirmation.

Template Override

See shared/references/template-override.md for the standard override mechanism.

Shared Resources

• shared/references/template-override.md
• shared/templates/pr-template.md (use resolve_template("pr-template.md") to respect overrides)
• shared/templates/mr-template.md (use resolve_template("mr-template.md") to respect overrides)
• shared/scripts/check_branch_name.py
• shared/scripts/check_forbidden_files.py

Handoff

• Complex commit splitting: use git-commit-discipline.
• Release request: use git-release-workflow.
• Missing branch strategy: use git-branch-strategy.

Output

Return current state, branch path, commit plan, PR/MR information, verification status, and next step.