git-workflow

分类: 运维与交付 | 上传者: netresearch | 下载: 0 | 版本: v1.0（最新）

在建立分支策略、实施常规提交、创建或审查 PR、解决 PR 审查意见、合并 PR（包括 CI 验证、自动合并队列和合并后清理）、管理 PR 审查线程、将 PR 与签名提交合并、处理合并冲突、创建版本或将 Git 与 CI/CD 集成时使用。

更新日志: Source: GitHub https://github.com/netresearch/git-workflow-skill

目录结构

当前层级: tree/main/skills/git-workflow/

📁 evals/
- 📄 evals.json 7.5 KB
📁 references/
- 📄 advanced-git.md 11.2 KB
- 📄 branching-strategies.md 8.5 KB
- 📄 ci-cd-integration.md 13.3 KB
- 📄 code-quality-tools.md 8.3 KB
- 📄 commit-conventions.md 9.7 KB
- 📄 git-hooks-setup.md 1.8 KB
- 📄 github-releases.md 7.7 KB
- 📄 pull-request-workflow.md 17.6 KB
📁 scripts/
- 📄 verify-git-workflow.sh 7.3 KB
📄 checkpoints.yaml 8.5 KB
📄 SKILL.md 3.3 KB

SKILL.md

---
name: git-workflow
description: "Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, creating releases, or integrating Git with CI/CD."
license: "(MIT AND CC-BY-SA-4.0). See LICENSE-MIT and LICENSE-CC-BY-SA-4.0"
compatibility: "Requires git, gh CLI."
metadata:
  author: Netresearch DTT GmbH
  version: "1.12.0"
  repository: https://github.com/netresearch/git-workflow-skill
allowed-tools: Bash(git:*) Bash(gh:*) Read Write
---

# Git Workflow Skill

Expert patterns for Git version control: branching, commits, collaboration, and CI/CD.

## Reference Files

Load references on demand based on the task at hand:

| Reference | Content Triggers |
|-----------|-----------------|
| `references/branching-strategies.md` | Branching model, Git Flow, GitHub Flow, trunk-based, branch protection |
| `references/commit-conventions.md` | Commit messages, conventional commits, semantic versioning, commitlint |
| `references/pull-request-workflow.md` | PR create/review/merge, thread resolution, merge strategies, CODEOWNERS, signed commits + rebase |
| `references/ci-cd-integration.md` | GitHub Actions, GitLab CI, semantic release, deployment |
| `references/advanced-git.md` | Rebase, cherry-pick, bisect, stash, worktrees, reflog, submodules, recovery |
| `references/github-releases.md` | Release management, immutable releases, `--latest=false`, multi-branch |
| `references/git-hooks-setup.md` | Hook frameworks, detection, recommended hooks per stage |
| `references/code-quality-tools.md` | shellcheck, shfmt, git-absorb, difftastic |

## Conventional Commits

```
<type>[scope]: <description>
```

**Types**: `feat` (MINOR), `fix` (PATCH), `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`, `revert`

**Breaking change**: Add `!` after type or `BREAKING CHANGE:` in footer.

## Branch Naming

```
feature/TICKET-123-description
fix/TICKET-456-bug-name
release/1.2.0
hotfix/1.2.1-security-patch
```

## Hook Detection

Before first commit, detect and install hooks:

```bash
ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo "No hooks"
```

Install: lefthook.yml -> `lefthook install` | captainhook.json -> `composer install` | .husky/ -> `npm install` | .pre-commit-config.yaml -> `pre-commit install`

## Critical Release Rules

1. **Immutable releases**: Deleted GitHub releases block tag names PERMANENTLY. Never delete releases to "fix" issues -- bump version instead.
2. **Multi-branch releases**: Always use `--latest=false` when releasing from non-default branches (LTS, maintenance, hotfix).
3. **Pre-release checklist**: Version updated in source files, CI passes, CHANGELOG updated, `git pull` on main -- verify BEFORE `gh release create`.

## PR Merge Requirements

Before merging: all threads resolved, CI checks green (including annotations), branch rebased, commits signed (if required). For signed commits + rebase-only repos, use local `git merge --ff-only`.

## Verification

```bash
./scripts/verify-git-workflow.sh /path/to/repository
```

---

> **Contributing:** https://github.com/netresearch/git-workflow-skill

登录后下载/点赞/收藏 ❤ 9 | ★ 0

git-workflow

目录结构

SKILL.md

举报内容

提示