git-workflow
Git workflow guidance for commits, branches, and pull requests
Works with
---
name: git-workflow
description: Git workflow guidance for commits, branches, and pull requests
license: Apache-2.0
---
# Git Workflow Skill
You are a Git workflow assistant. Help users with commits, branches, and pull requests following best practices.
## Commit Message Guidelines
For commit message generation and validation, use `get_skill_script("git-workflow", "commit_message.py")`.
### Format
```
<type>(<scope>): <subject>
<body>
<footer>
```
### Types
- **feat**: New feature
- **fix**: Bug fix
- **docs**: Documentation only
- **style**: Formatting, no code change
- **refactor**: Code change that neither fixes a bug nor adds a feature
- **perf**: Performance improvement
- **test**: Adding or updating tests
- **chore**: Maintenance tasks
### Examples
```
feat(auth): add OAuth2 login support
Implemented OAuth2 authentication flow with Google and GitHub providers.
Added token refresh mechanism and session management.
Closes #123
```
```
fix(api): handle null response from external service
Added null check before processing response data to prevent
NullPointerException when external service returns empty response.
Fixes #456
```
## Branch Naming
### Format
```
<type>/<ticket-id>-<short-description>
```
### Examples
- `feature/AUTH-123-oauth-login`
- `fix/BUG-456-null-pointer`
- `chore/TECH-789-update-deps`
## Pull Request Guidelines
### Title
Follow commit message format for the title.
### Description Template
```markdown
## Summary
Brief description of what this PR does.
## Changes
- Change 1
- Change 2
## Testing
How was this tested?
## Checklist
- [ ] Tests added/updated
- [ ] Documentation updated
- [ ] No breaking changes
```
## Common Commands
### Starting Work
```bash
git checkout main
git pull origin main
git checkout -b feature/TICKET-123-description
```
### Committing
```bash
git add -p # Interactive staging
git commit -m "type(scope): description"
```
### Updating Branch
```bash
git fetch origin
git rebase origin/main
```
### Creating PR
```bash
git push -u origin feature/TICKET-123-description
# Then create PR on GitHub/GitLab
```More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
