Git交互式变基默认先Rebase再Squash易冲突，如何切换流程？

问题背景 #

以下是执行git rebase --interactive --autosquash的典型示例（复制自JetBrains IDE的Git控制台）：

git rebase --interactive --update-refs origin/master
Rebasing (1/102)
Rebasing (2/102)
error: could not apply eff00df3... reorganised packages, most code under commons module are moved into commons package
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply eff00df3... reorganised packages, most code under commons module are moved into commons package
20:44:44.877: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false checkout --theirs -- parent/core/src/main/scala/com/tribbloids/spookystuff/actions/Action.scala
20:44:44.933: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f --sparse -- parent/core/src/main/scala/com/tribbloids/spookystuff/actions/Action.scala
20:44:44.992: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --continue
Rebasing (3/102)
error: could not apply 7f57c3d2... ascii-graphs is gone, redundant
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7f57c3d2... ascii-graphs is gone, redundant
20:44:51.618: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false checkout --theirs -- parent/commons/build.gradle.kts
20:44:51.648: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f --sparse -- parent/commons/build.gradle.kts
20:44:51.702: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --continue
Rebasing (4/102)
error: could not apply 90de9a85... upgrade scala & git modules
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 90de9a85... upgrade scala & git modules
20:44:55.912: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false checkout --theirs -- gradle.properties
20:44:55.941: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f --sparse -- gradle.properties
20:44:55.976: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --continue
Rebasing (5/102)
Rebasing (6/102)
error: could not apply 17a3e6be... TypedRow can compile now
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 17a3e6be... TypedRow can compile now
20:45:00.156: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false checkout --theirs -- prover-commons
20:45:00.172: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f --sparse -- prover-commons
20:45:00.204: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --continue
Rebasing (7/102)
error: could not apply e3fd60b3... upgrade libraries & dependencies
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e3fd60b3... upgrade libraries & dependencies
20:45:03.434: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false checkout --theirs -- prover-commons
20:45:03.450: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f --sparse -- prover-commons
20:45:03.484: [/home/peng/git/spookystuff] git /usr/bin/git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= rebase --continue
Rebasing (8/102)
Rebasing (9/102)
Rebasing (10/102)
Rebasing (11/102)
error: could not apply 5565160b... upgrade & adapt to submodule
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 5565160b... upgrade & adapt to submodule

...

可见Git默认行为会先逐个变基大量提交再执行Squash，引发大量error: could not apply xxx错误，每个都需手动处理，存在人为失误风险。

问题1：为何Git交互式变基默认采用先Rebase再Squash的流程？ #

Git交互式变基的核心是线性重演提交，默认流程先rebase再squash主要有两个原因：

• 技术实现逻辑：变基本质是把当前分支的提交依次"移植"到目标分支上，squash作为交互式变基的编辑指令，必须在提交重演的过程中执行——因为squash需要明确指定要合并的连续提交，只能在线性的提交应用流程中完成合并操作。
• 提交依赖保障：很多提交之间存在依赖关系（比如后续提交修改了前一个提交的代码），先逐个应用提交再合并，能确保squash后的提交基于完整的变更历史生成，避免合并时出现代码缺失或逻辑断裂。

问题2：如何切换为先Squash再Rebase的流程，或其他能最小化冲突处理的流程？ #

方法1：先本地合并提交，再变基（先Squash再Rebase） #

这是最直接的解决方案，步骤如下：

1. 本地合并目标提交：
   • 执行git rebase -i HEAD~N（N为需要合并的提交数量），在弹出的编辑界面中，将需要合并的提交指令改为squash（保留提交信息）或fixup（丢弃提交信息），保存退出完成合并。
   • 如果使用--autosquash，可先将需要合并的提交标题改为fixup! 目标提交标题或squash! 目标提交标题，再执行git rebase -i --autosquash HEAD~N自动完成合并。
2. 合并完成后，执行git rebase origin/master将合并后的提交变基到目标分支，此时只需处理一次合并提交与目标分支的冲突，大幅减少冲突次数。

方法2：使用git merge --squash替代（适合无需保留原提交历史的场景） #

1. 切换到目标分支的临时分支：git checkout origin/master && git checkout -b temp-branch
2. 执行squash合并功能分支：git merge --squash your-feature-branch，将功能分支的所有变更合并为工作区的未提交修改
3. 提交合并后的变更：git commit -m "合并功能分支的所有变更"
4. 将临时分支合并或变基到目标分支即可。

方法3：使用git rebase --rebase-merges（Git 2.22+版本支持） #

如果需要保留部分提交结构同时减少冲突，可执行：

git rebase -i --rebase-merges --autosquash origin/master

该命令会保留分支的合并结构，同时自动处理squash操作，相对于默认流程能降低重复冲突的概率。

内容的提问来源于stack exchange，提问作者tribbloid