Menu
Best practices for Git version control workflows including branching strategies, commit conventions, and collaboration patterns. Use when working with Git repositories, managing branches, or coordinating team development.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Performs thorough code reviews focusing on correctness, security, performance, and maintainability. Use when reviewing pull requests, examining code changes, or auditing existing code.
Systematic approach to debugging software issues. Use when encountering bugs, errors, unexpected behavior, or when trying to understand why code isn't working as expected.
| name | git-workflow |
| description | Best practices for Git version control workflows including branching strategies, commit conventions, and collaboration patterns. Use when working with Git repositories, managing branches, or coordinating team development. |
| metadata | {"author":"mcp-tests","version":"1.0"} |
| allowed-tools | Bash(git:*) |
This skill provides guidance on effective Git workflows and best practices.
Use descriptive, prefixed branch names:
feature/add-user-authentication
bugfix/fix-login-redirect
hotfix/security-patch-cve-2024
refactor/extract-payment-module
docs/update-api-documentation
Follow conventional commits:
<type>(<scope>): <subject>
<body>
<footer>
feat: New featurefix: Bug fixdocs: Documentation onlystyle: Formatting, no code changerefactor: Code restructuringtest: Adding testschore: Maintenance tasksfeat(auth): add OAuth2 login support
Implement OAuth2 authentication flow with Google and GitHub providers.
Includes token refresh and secure storage.
Closes #123
fix(api): handle null response from payment gateway
The payment gateway occasionally returns null for declined cards.
Added null check and appropriate error message.
Fixes #456
# Start a new feature
git checkout main
git pull origin main
git checkout -b feature/my-feature
# Work on the feature
git add .
git commit -m "feat: implement feature"
# Keep up to date with main
git fetch origin
git rebase origin/main
# Push and create PR
git push -u origin feature/my-feature
# Create bugfix branch
git checkout -b bugfix/issue-description
# Make the fix
git add .
git commit -m "fix: resolve issue description"
# Push for review
git push -u origin bugfix/issue-description
# Update your branch
git fetch origin
git rebase origin/main
# If conflicts occur:
# 1. Edit conflicted files
# 2. Mark as resolved
git add <resolved-files>
git rebase --continue
# If you need to abort
git rebase --abort
# See what changed
git status
git diff
# Interactive staging
git add -p
# Amend last commit (before push)
git commit --amend
# View history
git log --oneline --graph
# Stash changes temporarily
git stash
git stash pop
# Undo last commit (keep changes)
git reset --soft HEAD~1