Git & GitHub Operations Skill
This skill governs the version control and task management workflow for the Golden Boilerplate. It integrates local Git operations with GitHub Issues via MCP.
1. Branching Convention
- •Rule: ALWAYS create a new branch before starting any coding work.
- •Format:
- •Features:
feat/<kebab-case-name>(e.g.,feat/user-profile) - •Bug Fixes:
fix/<kebab-case-name>(e.g.,fix/login-error) - •Refactoring:
refactor/<name>(e.g.,refactor/api-structure)
- •Features:
2. Task Replication (MCP Integration)
- •Trigger: When a new Feature or Implementation Plan is approved.
- •Process:
- •Read the active Implementation Plan (usually
implementation_plan.md). - •Identify distinct tasks/steps.
- •For each step, use the GitHub MCP Tool (
github_create_issueor similar) to create an Issue in the connected repository. - •CRITICAL: Record the returned Issue ID for each task. You will need this for commits.
- •Read the active Implementation Plan (usually
3. Atomic Commits
- •Rule: NEVER commit changes without referencing a specific Task/Issue.
- •Process:
- •Stage files related to one task.
- •Commit with the format:
type(scope): description (ref #ISSUE_ID).- •Example:
feat(auth): implement login endpoint (ref #12)
- •Example:
- •Immediately after committing, use the GitHub MCP Tool to either:
- •Close the Issue (if the task is fully complete).
- •Comment on the Issue (if it's a checkpoint).
4. Merge Protocol
- •Trigger: When all tasks in the plan are marked "Done".
- •Process:
0. Code Review: Execute
code-review-policyon the current branch differences. * If the Reviewer reports Critical Issues, ABORT the merge and request fixes.- •Run the full test suite:
pnpm test. - •If tests pass, ask the user: "All tasks complete. Shall I merge 'branch-name' into 'main'?"
- •If yes, perform the merge (or create a PR if preferred/configured).
- •Post-Merge: Call
release-managementskill to check if a new release/tag should be generated based on the commited changes.
- •Run the full test suite: