skills.rest
woxiangyangzhimao
woxiangyangzhimaoCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Implement Git workflows covering branching, commits, pull requests, and releases.

3|2|Updated Apr 12, 2026
Search Tags:#git#workflow#pull request#commit message#conflict resolution#branching strategy
One-click install
npx skills add https://github.com/woxiangyangzhimao/skills --skill git-workflow-woxiangyangzhimao
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/woxiangyangzhimao/skills/tree/main/git-workflow
Command: npx skills add https://github.com/woxiangyangzhimao/skills --skill git-workflow-woxiangyangzhimao

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill helps streamline and standardize Git workflows, providing best practices for various team sizes and project complexities.

Core Features & Use Cases

  • Branching Strategies: Offers guidance on choosing between GitHub Flow, Trunk-Based Development, and GitFlow based on team size and release cadence.
  • Commit Messages: Teaches the Conventional Commits format and how to write effective commit messages.
  • Merge vs Rebase: Explains the difference between merging and rebasing, and when to use each method.
  • Pull Request Workflow: Outlines best practices for writing PR titles, descriptions, and checklists.
  • Conflict Resolution: Provides strategies for identifying, resolving, and preventing merge conflicts.
  • Branch Management: Covers naming conventions, cleanup, and stashing for efficient branch management.
  • Release Management: Walks through semantic versioning and creating annotated tags.
  • Git Configuration: Offers essential configurations and aliases for a more efficient Git workflow.
  • Common Workflows: Outlines the steps for starting a new feature, updating a PR, syncing with upstream, and undoing mistakes.
  • Git Hooks: Describes how to use pre-commit and pre-push hooks for linting and testing.
  • Anti-Patterns: Lists common anti-patterns in Git workflow and how to avoid them.

Quick Start

Use the git-workflow skill to implement a GitHub Flow branching strategy for your project.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best way to choose a Git branching strategy for my team?▼

Choosing a Git branching strategy depends on your team size and release cadence, with options including GitHub Flow, Trunk-Based Development, and GitFlow. Evaluating these models against your project complexity ensures a streamlined collaborative workflow.

How do I write an effective commit message for a pull request?▼

Writing an effective commit message involves following the Conventional Commits format to ensure clear history tracking. Structuring commit messages with standardized prefixes clarifies the intent of changes within your pull request workflow.

When should I use git merge vs rebase to sync with upstream?▼

Using git merge versus rebase depends on whether you need to preserve absolute commit history or maintain a linear project timeline. Syncing with upstream through rebase avoids merge commits, while merging keeps the exact chronological context.

How do I resolve merge conflicts in a feature branch?▼

Resolving merge conflicts requires identifying overlapping changes and manually aligning the code in your feature branch. Preventing future conflicts involves consistent branch management and frequent syncing with the main development line.

Can I use Git hooks for automated linting before a commit?▼

You can use pre-commit and pre-push Git hooks to execute automated linting and testing before changes are finalized. Configuring these hooks ensures code quality validation directly within your Git workflow setup.

What are common Git workflow anti-patterns and how do I avoid them?▼

Common Git workflow anti-patterns include improper branch naming, infrequent syncing, and mismanaged stashing. Avoiding these anti-patterns requires implementing standardized branch management and adhering to established pull request checklists.

Related Skills

Explore More Software Engineering Skills→
giosuetedeschi-specgiosuetedeschi-spec

git-pushing

Automate git staging, committing, and pushing to remote repositories.

Community
Basic
mvillmowmvillmow
18

generate-changelog

Generate a Markdown changelog from git commits grouped by conventional commit types.

Community
Basic
InverterNetworkInverterNetwork

requesting-code-review

Automates pre-commit code verification through static security analysis, linting, and independent review.

Official
Advanced
EmmraanEmmraan

unified-version-control-and-source-code-management

Manage Git repositories with branching strategies, commit conventions, and CI/CD integration.

Community
Advanced