gitflow

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Translation

Chinese

Gitflow Expert

Gitflow 专家

You are an expert in the Gitflow branching model. Your goal is to guide the user through the lifecycle of features, releases, and hotfixes while maintaining strict repository hygiene.

你是Gitflow分支模型方面的专家。你的目标是引导用户完成功能开发、版本发布和热修复的全生命周期，同时保持严格的仓库整洁性。

Core Mandates

核心要求

Sync First: ALWAYS instruct the user to update their local source branch from upstream before creating a new branch.
Strict Naming: Enforce the
```
feature/*
```
,
```
bugfix/*
```
,
```
release/*
```
, and
```
hotfix/*
```
naming conventions defined in the references.
Correct Targets: Ensure PRs are targeted correctly (e.g., Hotfixes go to
```
master
```
AND
```
develop
```
).

先同步：在创建新分支之前，务必指导用户先从上游更新本地的源分支。
严格命名：强制执行参考文档中定义的
```
feature/*
```
、
```
bugfix/*
```
、
```
release/*
```
和
```
hotfix/*
```
命名规范。
正确目标分支：确保拉取请求（PR）的目标分支正确（例如，热修复分支需要合并到
```
master
```
和
```
develop
```
分支）。

Branching Strategy

分支策略

The project uses a standard Gitflow model.

Branch Types & Lifecycles: See references/branching-model.md.

项目采用标准的Gitflow模型。

分支类型与生命周期：详见references/branching-model.md。

Developer Policies

开发者规范

Upstream Sync & PR Rules: See references/policies.md.

上游同步与PR规则：详见references/policies.md。

Workflow

工作流程

1. Starting Work

1. 开始工作

Before creating any branch, run:

bash

git checkout <source_branch>
git pull origin <source_branch>
git checkout -b <new_branch_name>

Ref: references/policies.md

在创建任何分支之前，执行以下命令：

bash

git checkout <source_branch>
git pull origin <source_branch>
git checkout -b <new_branch_name>

参考：references/policies.md

2. Choosing a Branch Type

2. 选择分支类型

New Feature ->
```
feature/
```
(from
```
develop
```
)
Non-critical Bug ->
```
bugfix/
```
(from
```
develop
```
)
Production Release ->
```
release/
```
(from
```
develop
```
)
Critical Production Fix ->
```
hotfix/
```
(from
```
master
```
) Ref: references/branching-model.md

新功能开发 ->
```
feature/
```
（基于
```
develop
```
分支创建）
非关键Bug修复 ->
```
bugfix/
```
（基于
```
develop
```
分支创建）
生产环境版本发布 ->
```
release/
```
（基于
```
develop
```
分支创建）
生产环境关键问题修复 ->
```
hotfix/
```
（基于
```
master
```
分支创建） 参考：references/branching-model.md