Git 工作流最佳实践：从独狼到团队协作

1
# 从 develop 切出新功能分支
2
git checkout -b feature/user-auth develop
3

4
# 开发完成后合并回 develop
5
git checkout develop
6
git merge --no-ff feature/user-auth
7
git branch -d feature/user-auth

1
git checkout -b hotfix/security-patch main
2
# 修复代码...
3
git commit -am "fix: patch security vulnerability"
4
git checkout main
5
git merge --no-ff hotfix/security-patch
6
git tag -a v1.2.1 -m "Hotfix 1.2.1"
7
git checkout develop
8
git merge --no-ff hotfix/security-patch

1
# 1. 从 main 切分支
2
git checkout -b feat/add-search main
3

4
# 2. 开发并推送
5
git push -u origin feat/add-search
6

7
# 3. 开 PR、Code Review
8
# 在 GitHub/GitLab 上操作
9

10
# 4. 合并后本地同步
11
git checkout main
12
git pull origin main
13
git branch -d feat/add-search

1
# 短生命周期分支（< 2 天）
2
git checkout -b tiny-fix main
3
# 修改少量代码...
4
git checkout main
5
git merge tiny-fix
6
git push origin main
7

8
# Feature Flag 控制（伪代码示例）
9
if (featureFlags.isEnabled('new-dashboard')) {
10
  renderNewDashboard();
11
} else {
12
  renderOldDashboard();
13
}