git-workflows
This skill should be used for branching strategies, conventional commits, PR workflows, and release management, git flow, trunk-based development, merge strategies
When & Why to Use This Skill
This Claude skill streamlines the software development lifecycle by providing expert guidance and automation for Git branching strategies, conventional commits, and pull request workflows. It helps engineering teams maintain a clean codebase, ensure versioning consistency, and accelerate delivery through best practices like trunk-based development and standardized release management.
Use Cases
- Standardizing commit messages using the Conventional Commits specification to facilitate automated versioning and changelog generation.
- Implementing and managing professional branching strategies such as Git Flow or Trunk-Based Development to optimize team collaboration.
- Automating the Pull Request (PR) lifecycle, including branch creation, descriptive PR drafting, and integrating review feedback.
- Configuring Devloop environments to automate the 'Plan-Implement-Ship' workflow with consistent naming conventions and safety guardrails.
- Advising on complex merge strategies (Squash vs. Rebase) to maintain a readable and linear project history.
| name | git-workflows |
|---|---|
| description | This skill should be used for branching strategies, conventional commits, PR workflows, and release management, git flow, trunk-based development, merge strategies |
| whenToUse | Branching strategy, commit formatting, PR descriptions, releases, git flow, trunk-based development, merge vs rebase, release tagging |
| whenNotToUse | Simple add/commit/push, established team conventions |
| - skill | superpowers:finishing-a-development-branch |
| when | completing work, deciding merge/PR/cleanup options |
Git Workflows
Best practices for git branching and collaboration.
Devloop Integration
Configure git workflow in .devloop/local.md:
---
git:
auto-branch: true # Create branch when plan starts
branch-pattern: "feat/{slug}"
pr-on-complete: ask # ask | always | never
---
Related commands:
/devloop:ship- Commit with plan context, create PR/devloop:pr-feedback- Integrate review comments
Branch Naming
<type>/<ticket>-<description>
feat/AUTH-123-add-oauth
fix/BUG-456-null-pointer
feat/add-authentication (devloop default)
Trunk-Based Development (Recommended)
Modern approach favored by high-performing teams:
- Short-lived feature branches (hours to days)
- Frequent merges to main via PRs
- Strong CI/CD pipeline
- Feature flags for incomplete work
Devloop fit: Plan → Branch → Implement → Ship → PR
Conventional Commits
<type>(<scope>): <description>
feat(auth): add OAuth2 login support
fix(api): handle null response
refactor(utils): extract date formatting
| Type | Description |
|---|---|
| feat | New feature (MINOR) |
| fix | Bug fix (PATCH) |
| docs | Documentation |
| refactor | Code restructure |
| test | Tests |
| chore | Maintenance |
Devloop auto-generates commit messages from plan tasks using conventional format.
PR Workflow
- Create branch when starting plan
- Commit as you complete tasks
- Run
/devloop:shipwhen ready - Address feedback with
/devloop:pr-feedback - Push fixes and re-request review
Merge Strategies
- Merge commit: Preserve full history
- Squash merge: Clean linear history (recommended for feature PRs)
- Rebase merge: Linear, preserves commits
Safety Rules
Never on shared branches:
- Force push
- Rebase after push
- Reset after push