skills.rest
cffrank
cffrankCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Standardize Git branching, commit messages, and PR practices.

Updated Mar 28, 2026
Search Tags:#git#workflow#branching#ci-cd#pull-requests#conventional-commits#rebasing
One-click install
npx skills add https://github.com/cffrank/paperclip-skills-agents --skill git-workflow-cffrank
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/cffrank/paperclip-skills-agents/tree/main/skills/git-workflow
Command: npx skills add https://github.com/cffrank/paperclip-skills-agents --skill git-workflow-cffrank

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows and commit conventions vary across projects, creating integration frictions and inconsistent history. A standardized approach reduces merge conflicts, simplifies reviews, and keeps main deployable.

Core Features & Use Cases

  • Branching Strategy: trunk-based development with short-lived feature branches
  • Branch Naming Convention: descriptive, standardized prefixes for features, fixes, and chores
  • Conventional Commits: enforce standardized commit messages and scopes
  • Environment Branches: main -> production, staging, dev promotion workflows
  • Pull Request & Merge Guidance: PR templates, review gates, and merge strategies
  • History Cleanup & Rewrites: guidance on interactive rebase, squash merges, and rebase workflows
  • Worktrees & Advanced Flow: use git worktrees for parallel tasks without context switching
  • CI/CD Alignment: ensure checks run and gate deployments

Quick Start

Create a short-lived feature branch from main following trunk-based rules, then open a PR with a conventional-commit message.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I enforce consistent git commit conventions across multiple teams?▼

You can enforce consistent git commit conventions by applying conventional commits with standardized scopes across projects. This practice ensures a clean main branch and simplifies pull request reviews.

What is the best way to structure git branching for CI/CD environment promotion?▼

The best way to structure git branching for CI/CD environment promotion is using trunk-based development with environment branches. Map main to production, staging, and dev promotion workflows to gate deployments.

How do I clean up git history before opening a pull request?▼

To clean up git history before opening a pull request, use interactive rebase, squash merges, and rebase workflows. These history cleanup practices remove redundant commits and maintain a readable project timeline.

Can I use git worktrees for parallel feature branches in trunk-based development?▼

Yes, you can use git worktrees for parallel feature branches in trunk-based development. Worktrees allow you to manage multiple short-lived feature branches simultaneously without context switching or stashing.

Does trunk-based development work with standardized pull request templates?▼

Yes, trunk-based development works with standardized pull request templates. Short-lived feature branches merge into main through PR review gates and structured merge strategies, keeping the main branch deployable.

Why should I use conventional commits for CI-friendly release tagging?▼

You should use conventional commits for CI-friendly release tagging because standardized messages and scopes automate environment promotion and release cycles. This alignment keeps the main branch deployable with gated CI checks.

Related Skills

Explore More Software Engineering Skills→
okbest2024okbest2024

memory-git-sync

Automate OpenClaw workspace backups to a remote Git repository.

Community
Intermediate
poitchpoitch

merge-pr

Squash-merge pull requests, delete remote and local branches, and pull main.

Community
Intermediate
Romira915Romira915

create-pr

Creates a GitHub pull request from the current branch to main with generated title and body.

Community
Intermediate
kirvinkirvin

branching-strategy

Define and implement Git branching strategies for collaborative development.

Community
Intermediate