skills.rest
LangConfig
LangConfigOFFICIAL
Explore all skills by this author →
WebsiteGitHub

git-workflow

Guide teams to establish Git workflows with branching and commit standards.

55|15|Updated Dec 1, 2025
Search Tags:#git#workflow#collaboration#version control#branching#pull requests#merge conflicts
One-click install
npx skills add https://github.com/LangConfig/langconfig --skill git-workflow-langconfig
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/LangConfig/langconfig/tree/main/backend/skills/builtin/git-workflow
Command: npx skills add https://github.com/LangConfig/langconfig --skill git-workflow-langconfig

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Inconsistent Git practices, complex branching strategies, and frequent merge conflicts can hinder team collaboration and lead to version control headaches. This Skill provides expert guidance to establish efficient Git workflows.

Core Features & Use Cases

  • Branching Strategies: Choose and implement optimal branching models like GitHub Flow, GitFlow, or Trunk-Based Development.
  • Commit Standards: Enforce conventional commit messages for clear, automated release notes and history.
  • Conflict Resolution: Get step-by-step guidance for resolving merge conflicts and using interactive rebase for clean history.
  • Use Case: Your team is struggling with frequent merge conflicts and an unclear release process. Use this Skill to define a GitHub Flow strategy, establish branch naming conventions, and standardize commit messages, bringing order to your version control.

Quick Start

Set up a Git workflow for my team of 5 developers working on a web application with continuous deployment.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I resolve merge conflicts in Git?▼

Merge conflicts occur when changes overlap between branches. Identify conflicts in affected files, manually edit to keep desired changes, stage the resolved files, and commit. Use interactive rebase for a cleaner history when appropriate.

What's the best Git branching strategy for my team?▼

Choose based on release cadence: GitHub Flow for continuous deployment, GitFlow for scheduled releases with hotfix needs, or Trunk-Based Development for rapid iteration. Each enforces different branch lifecycles and merge patterns.

How do I set up pull request governance and code review?▼

Configure protected branches to require reviews before merge, define approval thresholds, enforce status checks, and establish naming conventions. This prevents unreviewed code and maintains workflow consistency across the team.

What are conventional commit messages and why use them?▼

Conventional commits follow a structured format (type, scope, description) enabling automated release notes and clear history. Standardizing messages across your team improves traceability and release automation.

Can I use Git workflows with continuous deployment?▼

Yes. GitHub Flow pairs directly with continuous deployment by merging to main for automatic releases. GitFlow and Trunk-Based Development also support CI/CD with different branch protection and deployment trigger strategies.

How do I enforce branch naming conventions across my team?▼

Define naming patterns (e.g., feature/*, bugfix/*, release/*), document standards, and use pre-commit hooks or branch protection rules to reject non-compliant names. Consistency improves branch organization and automated tooling.

Related Skills

Explore More Software Engineering Skills→
slamb2kslamb2k
5

start-right

Automate end-to-end repository initialization and scaffolding for new projects.

Community
Advanced
RyanJarvRyanJarv

github-release-management

Automate GitHub release planning, validation, deployment, and rollback for multi-package projects.

Community
Advanced
AnveioAnveio
1

task-pull-request

Automate GitHub pull request creation, reviews, feedback, and merges via gh CLI.

Community
Intermediate
ntluong95ntluong95

Git & Collaboration Standards

Enforce Git commit, branch, and pull request standards.

Community
Intermediate