skills.rest
cosmicstack-labs
cosmicstack-labsOFFICIAL
Explore all skills by this author →
Website𝕏@cosmicstackGitHub

git-workflow

Standardize Git branching, commits, rebasing, and PR review workflows.

364|53|Updated May 9, 2026
Search Tags:#git#code review#collaboration#conventional commits#rebase#branching strategy#commit hygiene
One-click install
npx skills add https://github.com/cosmicstack-labs/mercury-agent-skills --skill git-workflow-cosmicstack-labs
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/cosmicstack-labs/mercury-agent-skills/tree/main/categories/development/git-workflow
Command: npx skills add https://github.com/cosmicstack-labs/mercury-agent-skills --skill git-workflow-cosmicstack-labs

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps teams avoid messy history, unclear collaboration, and inconsistent review practices by standardizing how branching, commits, rebases, and code reviews work.

Core Features & Use Cases

  • Branching strategies that match your release cadence: Choose trunk-based development or GitFlow based on team size and deployment model, including guidance for mainline protection and release/hotfix workflows.
  • Commit conventions that improve traceability: Apply Conventional Commits for readable intent, better changelogs, and more reliable semantic versioning.
  • Empathetic, structured code review patterns: Use a checklist and response styles to improve quality and reduce friction during PRs.
  • History hygiene with safe rebasing guidance: Encourage clean histories while warning against rebasing shared branches without coordination.

Quick Start

Use this workflow playbook to align your team on trunk-based development or GitFlow, adopt Conventional Commits for every change, and run PR reviews with the provided checklist.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What's the best way to standardize Git branching and code review practices for a software team?▼

Standardizing Git collaboration involves adopting a branching strategy like trunk-based development or GitFlow, applying Conventional Commits for traceability, and using structured PR checklists to improve code review quality and maintain cleaner history.

How do I choose between trunk-based development and GitFlow for my release workflow?▼

Choosing between trunk-based development and GitFlow depends on your team size and deployment model. Trunk-based suits continuous deployment, while GitFlow provides structured release and hotfix branches for teams needing coordinated change integration.

How do Conventional Commits improve commit hygiene and code traceability?▼

Conventional Commits improve commit hygiene by standardizing commit messages with readable intent. This practice enhances code traceability, generates better changelogs, and ensures more reliable semantic versioning across software projects.

When should I avoid rebasing shared branches in a Git workflow?▼

You should avoid rebasing shared branches without team coordination because it rewrites commit history and causes integration conflicts. Safe rebasing guidance encourages clean histories while protecting shared branches during collaborative development.

Can I use a structured PR checklist to reduce friction during code reviews?▼

Yes, using a structured PR checklist reduces friction during code reviews by applying empathetic response styles and consistent quality checks. This ensures teams evaluate changes systematically rather than relying on ad-hoc review practices.

Does implementing Conventional Commits require a specific branching strategy to work?▼

No, implementing Conventional Commits does not require a specific branching strategy. It works independently to improve commit clarity and history hygiene across any model, including both trunk-based development and GitFlow releases.

Related Skills

Explore More Software Engineering Skills→
nodatallnodatall
2

cleanup-merged-branches

Delete merged Git branches locally and remotely with safety checks.

Community
Intermediate
jgeldartjgeldart

changelog-automation

Generate changelogs and release notes from commits, PRs, and releases.

Community
Advanced
ROYCE-8425ROYCE-8425
1

springboot-verification

Automate build, static analysis, testing, and security scans for Spring Boot projects.

Community
Advanced
DNYoussefDNYoussef
4

when-managing-multiple-repos-use-github-multi-repo

Coordinates GitHub multi-repo architecture enforcement and synchronized releases via hierarchical swarm orchestration.

Community
Advanced