public-git-workflow-expert-base

Git Workflow Knowledge Base

Foundational guidance for Git version control workflows, branching strategies, commit conventions, and collaborative development.

Source: Extends netresearch/git-workflow-skill v1.18.8 (CC-BY-SA-4.0). Team-specific rules overlay on top.

架构分层

┌─────────────────────────────────────────────┐
│  下游技能（extends 本基座）                    │
│  devlab-git-workflow-expert 等               │
├─────────────────────────────────────────────┤
│  团队规范叠加层（本文件 §团队规范章节）          │
│  commit 规范 / 分支策略 / Gitea / 镜像同步     │
├─────────────────────────────────────────────┤
│  上游通用知识（netresearch/git-workflow-skill） │
│  branching / commits / PR / CI / hooks       │
└─────────────────────────────────────────────┘

Workflow

1. Determine the workflow model (Git Flow / GitHub Flow / Trunk-based).
2. Create branch following naming conventions (Section: Branch Naming).
3. Make atomic commits with Conventional Commits (Section: Commit Conventions).
4. Push and open PR with proper description (Section: PR Workflow).
5. Ensure CI green + all review threads resolved before merge.
6. Merge with appropriate strategy — feature PR 默认 squash（见 §PR Workflow）。
7. Release 打 tag：v{major}.{minor}.{patch}（见 §Release & Tag）。

Critical Rules (Non-Negotiable)

1. No direct push to main — always open a PR.
2. No merge before all threads resolved — see references/pull-request-workflow.md.
3. Feature PR 默认 squash merge — 开发分支历史压缩为一个干净 commit；release/hotfix 保留完整历史。
4. No "tested/verified" without pasted command output — else say so explicitly.
5. Force-push only with --force-with-lease — never plain --force.
6. Commit before rebase — add → commit → fetch → rebase → push. Dirty tree aborts rebase.
7. No editorializing — state what changed, not how good it is.
8. Gitea-first — git clone 和 git remote 优先使用 Gitea 内网地址，避免直连 GitHub。
9. 内网镜像优先 — git clone 时优先 Gitea 内网镜像 URL，减少公网流量和延迟。