Git Workflow Automation

Name: Git Workflow Automation
Author: agent-skills

Caution

Git 工作流自动化

Automate Git commit messages, branch management, PR creation, and merge conflict resolution with intelligent context awareness.

智能自动化 Git 提交信息、分支管理、PR 创建和合并冲突解决，具备上下文感知能力。

By agent-skills 12,450 v2.3.1 Updated 2026-03-10

Install

Claude Code

claude install git-workflow

Cursor

cursor ext install git-workflow

OpenAI Codex CLI

codex install git-workflow

Windsurf

windsurf ext install git-workflow

About This Skill

Overview

Git Workflow Automation streamlines your entire version control process. Instead of manually crafting commit messages, creating branches, and writing PR descriptions, this skill handles it all with intelligent context awareness.

Key Features

Smart Commit Messages: Analyzes your diff and generates conventional commit messages that accurately describe changes, including scope detection and breaking change identification.
Branch Management: Creates branches following your team's naming conventions (feature/, bugfix/, hotfix/) and suggests names based on the task context.
PR Automation: Generates comprehensive PR descriptions with change summaries, testing notes, and reviewer suggestions based on code ownership.
Conflict Resolution: When merge conflicts arise, the skill understands both sides of the conflict and suggests intelligent resolutions rather than blindly picking one side.

How It Works

The skill reads your repository's Git history, branch structure, and configuration to understand your team's conventions. It then applies these patterns consistently across all Git operations.

Best Practices

Enable conventional commits enforcement to maintain a clean, parseable Git history. Combine with CI Pipeline skill for automated changelog generation from your commit history.

关于此技能

概述

Git 工作流自动化简化了整个版本控制流程。无需手动编写提交信息、创建分支和撰写 PR 描述，该技能通过智能上下文感知自动处理一切。

核心功能

智能提交信息：分析你的 diff 并生成符合约定式提交规范的信息，准确描述变更内容，包括范围检测和破坏性变更识别。
分支管理：按照团队命名规范（feature/、bugfix/、hotfix/）创建分支，并根据任务上下文建议分支名称。
PR 自动化：生成包含变更摘要、测试说明和基于代码所有权的审阅者建议的全面 PR 描述。
冲突解决：当出现合并冲突时，该技能理解冲突双方的上下文，给出智能合并建议，而非盲目选择一方。

工作原理

该技能读取仓库的 Git 历史、分支结构和配置，理解团队的惯例，然后在所有 Git 操作中一致地应用这些模式。

最佳实践

启用约定式提交强制执行，保持干净、可解析的 Git 历史。与 CI Pipeline 技能结合使用，可从提交历史自动生成变更日志。

Use Cases / 使用场景

Generate semantic commit messages from staged changes
Create feature branches with naming conventions
Auto-generate PR descriptions from commit history
Resolve merge conflicts with contextual understanding
Enforce conventional commits across a team

根据暂存的更改生成语义化提交信息
按照命名规范创建功能分支
根据提交历史自动生成 PR 描述
利用上下文理解解决合并冲突
在团队中强制执行约定式提交规范

Pros & Cons

Pros

+ Dramatically reduces time spent on repetitive Git tasks
+ Ensures consistent commit message quality across teams
+ Intelligent conflict resolution reduces merge errors
+ Supports all major Git workflows (GitFlow, trunk-based, GitHub Flow)

大幅减少重复性 Git 任务的时间消耗
确保团队间提交信息质量的一致性
智能冲突解决减少合并错误
支持所有主流 Git 工作流（GitFlow、主干开发、GitHub Flow）

Cons

- Generated commit messages may need manual refinement for complex changes
- Branch naming suggestions require initial configuration to match team conventions
- Large repositories with extensive history may experience slower analysis