skills.rest
AsiaOstrich
AsiaOstrichCOMMUNITY
Explore all skills by this author →
𝕏@AsiaOstrichGitHub

Git Workflow Guide

Guide Git branching strategies, naming conventions, and merge operations.

70|13|Updated Dec 24, 2025
Search Tags:#git#workflow#branching#merge#gitflow#github flow
One-click install
npx skills add https://github.com/AsiaOstrich/universal-dev-standards --skill git-workflow-guide-asiaostrich
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Git Workflow Guide
Source: https://github.com/AsiaOstrich/universal-dev-standards/tree/main/.gemini/skills/git-workflow-guide
Command: npx skills add https://github.com/AsiaOstrich/universal-dev-standards --skill git-workflow-guide-asiaostrich

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides clear guidance on Git branching strategies, naming conventions, and merge operations, ensuring consistency and efficiency in your team's development workflow.

Core Features & Use Cases

  • Strategy Selection: Recommends GitFlow, GitHub Flow, or Trunk-Based Development based on project needs.
  • Branch Naming: Enforces descriptive and consistent branch naming conventions.
  • Merge Guidance: Explains different merge strategies (Squash, Merge Commit, Rebase) and when to use them.
  • Use Case: A new developer joins a project and is unsure about the team's Git practices. They can use this Skill to understand the recommended branching strategy, how to name their feature branches, and the process for merging their work.

Quick Start

Use the Git Workflow Guide skill to learn about the GitHub Flow branching strategy.

Frequently Asked Questions about Git Workflow Guide

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

FAQPage Schema
What is the best git branching strategy for my team's project?▼

The best git branching strategy depends on your project needs. This guide compares GitFlow, GitHub Flow, and Trunk-Based Development to recommend the right workflow for your release cycle and team structure.

How do I manage git merge operations and resolve branch conflicts?▼

To manage git merge operations, you choose between Squash, Merge Commit, and Rebase. This guide explains when to apply each strategy to handle branch integrations and maintain a clean commit history.

What are the standard naming conventions for feature branches in GitHub Flow?▼

Standard naming conventions for feature branches ensure descriptive tracking. This guide provides best practices for formatting branch names to align with your team's standardized GitHub Flow development practices.

When should I use GitFlow versus Trunk-Based Development?▼

Use GitFlow for projects with scheduled release cycles and Trunk-Based Development for continuous delivery. This guide details the differences to help you decide which workflow fits your deployment cadence.

How do I start using a standardized git workflow as a new developer?▼

To start using a standardized git workflow, review the recommended branching strategies and merge operations. This guide helps new developers understand team practices for creating, managing, and merging branches.

Related Skills

Explore More Software Engineering Skills→
SimHackerSimHacker
49

reward

Generates context-appropriate rewards for achievements, including items, abilities, titles, and heirlooms.

Community
Basic
oxieoxie

staging-deployment-phase

Automate staging deployment with auto-merge for merged pull requests.

Community
Intermediate
etylsarinetylsarin
59

git-workflow

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

Community
Intermediate
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced