Week 03: 分支模型与合并策略

# 查看分支指向的 Commit
cat .git/refs/heads/main
# a1b2c3d4e5f6...

# 等价于
git rev-parse main

cat .git/HEAD
# ref: refs/heads/main

git checkout a1b2c3d
cat .git/HEAD
# a1b2c3d4e5f6...

feature/    # 功能开发
bugfix/     # Bug 修复
hotfix/     # 紧急修复
release/    # 发布准备
experiment/ # 实验性功能

# 创建分支
git branch feature

# 创建并切换
git checkout -b feature
git switch -c feature  # Git 2.23+

# 切换分支
git checkout main
git switch main  # Git 2.23+

# 查看分支
git branch          # 本地
git branch -r       # 远程
git branch -a       # 全部
git branch -v       # 含最后提交
git branch --merged # 已合并到当前分支

# 删除分支
git branch -d feature    # 安全删除 (已合并)
git branch -D feature    # 强制删除

# 重命名分支
git branch -m old-name new-name

# 推送分支
git push origin feature

# 建立跟踪关系
git push -u origin feature
git branch --set-upstream-to=origin/feature feature

# 删除远程分支
git push origin --delete feature

Before:
main:       A---B
feature:        \---C---D

After (git merge feature):
main:       A---B---C---D

git merge feature
# Fast-forward

Before:
main:       A---B---E
feature:        \---C---D

After (git merge feature):
main:       A---B---E---F (merge commit)
                 \     /
feature:          C---D

git merge feature
# Merge made by the 'recursive' strategy.

# 使用 ours 策略 (只保留当前分支内容)
git merge -s ours feature

# 合并多个分支 (octopus)
git merge feature1 feature2 feature3

# 禁止 Fast-Forward (总是创建合并提交)
git merge --no-ff feature

# 只允许 Fast-Forward
git merge --ff-only feature

# 合并但不提交, 用于检查
git merge --no-commit feature

# 合并后压缩为一个提交
git merge --squash feature
git commit -m "Merge feature"

<<<<<<< HEAD
当前分支的内容
=======
合并分支的内容
>>>>>>> feature

# 1. 查看冲突文件
git status

# 2. 手动编辑解决冲突
vim conflict.txt

# 3. 标记为已解决
git add conflict.txt

# 4. 完成合并
git commit

# 使用合并工具
git mergetool

# 常用工具配置
git config --global merge.tool vimdiff
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# 自动选择某一方
git merge -X ours feature    # 冲突时保留当前分支
git merge -X theirs feature  # 冲突时保留合并分支

# 注意: -X 是策略选项, 不是策略
# -s ours 会忽略所有更改
# -X ours 只在冲突时选择当前分支

# 启用 Rerere
git config --global rerere.enabled true

# 查看记录
ls .git/rr-cache/

# 清除记录
git rerere forget conflict.txt

# 创建 worktree
git worktree add ../feature-worktree feature

# 列出 worktree
git worktree list

# 删除 worktree
git worktree remove ../feature-worktree

# 比较两个分支
git diff main..feature
git diff main...feature  # 自共同祖先起

# 查看分支差异的提交
git log main..feature    # feature 有而 main 没有的
git log main...feature   # 两边各自独有的

# 查看共同祖先
git merge-base main feature