skills.rest
contentbugvideoediting
contentbugvideoeditingCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Define branching strategies, commit conventions, and release tagging for Git workflows.

Updated Aug 27, 2026
Search Tags:#git#collaboration#branching#merge#rebase#workflows#version-control
One-click install
npx skills add https://github.com/contentbugvideoediting/cb-project-assistant --skill git-workflow-contentbugvideoediting
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/contentbugvideoediting/cb-project-assistant/tree/main/services/cb-s-claude/vendor/s-claude/skills-library/git-workflow
Command: npx skills add https://github.com/contentbugvideoediting/cb-project-assistant --skill git-workflow-contentbugvideoediting

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows and branch management are often inconsistent across teams, leading to merge conflicts and release delays.

Core Features & Use Cases

  • GitHub Flow, Trunk-Based Development, and GitFlow patterns with clear rules for main, feature branches, and releases.
  • Commit message conventions, PR descriptions, and merge strategies to preserve history and maintain code quality.
  • When to rebase vs merge, conflict resolution guidelines, and branch lifecycle management across small to large teams.

Quick Start

Follow these guidelines to align your project with a single, proven Git workflow and implement it across all repositories.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best Git workflow for distributed teams to avoid merge conflicts?▼

Git workflows like GitFlow, trunk-based development, and GitHub Flow establish clear rules for main and feature branches, helping distributed teams prevent merge conflicts and release delays through consistent branching strategies and commit conventions.

How do I decide between using a merge or rebase strategy for feature branches?▼

Choose between merge and rebase based on your history requirements: merging preserves complete branch context, while rebasing creates a linear project history by applying commits sequentially to the main branch.

When should distributed teams use trunk-based development over GitFlow?▼

Teams should use trunk-based development over GitFlow when requiring fast continuous integration to a deployable main branch, whereas GitFlow better suits larger projects with structured, long-term release cycles.

How do I establish commit message conventions and PR descriptions for version control?▼

Establish commit message conventions and PR descriptions by defining rules for feature branches and merges, ensuring consistent history and reliable deployments across all repositories in your version control workflow.

Can I apply a single Git workflow pattern across small and large software projects?▼

Yes, you can apply a single Git workflow pattern across small and large projects by defining adaptable rules for main branch deployability, feature branch creation, and release tagging that scale with your team size.

Why does my main branch need to stay deployable during feature development?▼

Your main branch must stay deployable during feature development to ensure reliable deployments and consistent history, enforced by isolating new work in feature branches and using proper release tagging.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
gitgoodordietryinggitgoodordietrying
1

cicd-pipeline

Automate CI/CD pipelines with GitHub Actions across Node.js, Python, Go, and Rust.

Community
Advanced
etylsarinetylsarin
59

git-workflow

Enforce feature-branch pull request workflows and prevent direct commits to main.

Community
Intermediate
shobhit-16shobhit-16

deployment-git

Coordinate SDK release onboarding, CI/CD setup, and Git workflows for the Kailash Python SDK.

Community
Advanced