main
  │
  ├── develop
  │     │
  │     ├── feature/xxx ──────┐
  │     │                     │ (合并后删除)
  │     ├── fix/xxx ──────────┤
  │     │                     │
  │     └─────────────────────┘
  │
  └── hotfix/xxx ──► main (紧急修复直接合并)

<type>(<scope>): <subject>

[body]

[footer]

feat(auth): implement OAuth2 login
fix(api): handle null response gracefully
docs(readme): add installation guide

feat(auth): add two-factor authentication

Two-factor authentication improves account security
by requiring a second verification step during login.

- Support TOTP-based authenticators
- Add backup codes for account recovery
- Rate limit verification attempts

feat(api): redesign user endpoint

BREAKING CHANGE: User endpoint now requires authentication.
The /api/users endpoint no longer supports anonymous access.

Closes #123
Refs #456, #789

feat(user): add password reset functionality

Implement password reset flow with email verification.
Users can now request a password reset link via email.

- Add password reset request endpoint
- Implement email token generation
- Add token expiration (24 hours)
- Create password reset confirmation page

Closes #234

# 1. 创建功能分支
git checkout develop
git pull origin develop
git checkout -b feature/new-feature

# 2. 开发并提交
git add .
git commit -m "feat: implement new feature"

# 3. 保持与 develop 同步
git fetch origin
git rebase origin/develop

# 4. 推送并创建 PR
git push origin feature/new-feature

main ─────────────────────────────────────► (生产环境)
  │                                    ▲
  │                                    │
  ▼                                    │
develop ──► feature/* ──► develop ──► release/* ──► main
                                         │
                                         ▼
                                      hotfix/*

# 短生命周期的功能分支
git checkout -b feature/small-change
# 开发（1-2 天内完成）
git commit -m "feat: small improvement"
git push origin feature/small-change
# 快速 review 后合并到 main

# 整理提交历史
git rebase -i origin/develop

# 检查改动
git diff origin/develop

# 确保无冲突
git fetch origin
git rebase origin/develop

# 依赖目录
node_modules/
vendor/
venv/

# 构建产物
dist/
build/
*.exe

# IDE 配置
.idea/
.vscode/
*.swp

# 环境变量
.env
.env.local
*.env

# 日志和临时文件
*.log
*.tmp
.cache/

# 系统文件
.DS_Store
Thumbs.db

# pre-commit: 代码格式化和 lint
# commit-msg: 验证 commit message 格式
# pre-push: 运行测试

# 保留改动，撤销提交
git reset --soft HEAD~1

# 完全撤销（慎用）
git reset --hard HEAD~1

git commit --amend -m "fix: correct commit message"

# 1. 查看冲突文件
git status

# 2. 手动编辑解决冲突

# 3. 标记为已解决
git add <file>

# 4. 继续合并/变基
git merge --continue
# 或
git rebase --continue

git remote add upstream <原仓库地址>
git fetch upstream
git merge upstream/main