Git 合并因分段错误而失败
Git merge fails on Segmentation fault
我有一个涉及很多 inexact rename 的大型合并，但它失败了：
Performing inexact rename detection: 100% (169817200/169817200), done.
Performing inexact rename detection: 100% (2106881938/2106881938), done.
Performing inexact rename detection: 100% (120035958/120035958), done.
Segmentation fault
我试图重新启动我的 VDI 但它没有帮助。知道如何解决吗？
从 the discussion 开始，只有在涉及重命名的文件夹和许多文件的复杂合并过程中才会发生这种情况。
这是新 merge strategy ORT（“表面上递归的双胞胎”）的工作。
该合并策略将成为 2.34 中的默认策略，但与此同时，git 2.33.0.2:
git merge -s ort
The primary difference noticable here is that the updating of the working tree and index is not done simultaneously with the merge algorithm, but is a separate post-processing step.
The new API is designed so that one can do repeated merges (e.g. during a rebase or cherry-pick) and only update the index and working tree one time at the end instead of updating it with every intermediate result.
Also, one can perform a merge between two branches, neither of which match the index or the working tree, without clobbering the index or working tree.
The "ort" backend does the complete merge inmemory, and only updates the index and working copy as a post-processing step.
它确实可以处理文件冲突，file/Folder 重命名比以前更有效（使用默认的“递归”策略）。
我有一个涉及很多 inexact rename 的大型合并，但它失败了：
Performing inexact rename detection: 100% (169817200/169817200), done.
Performing inexact rename detection: 100% (2106881938/2106881938), done.
Performing inexact rename detection: 100% (120035958/120035958), done.
Segmentation fault
我试图重新启动我的 VDI 但它没有帮助。知道如何解决吗？
从 the discussion 开始，只有在涉及重命名的文件夹和许多文件的复杂合并过程中才会发生这种情况。
这是新 merge strategy ORT（“表面上递归的双胞胎”）的工作。
该合并策略将成为 2.34 中的默认策略，但与此同时，git 2.33.0.2:
git merge -s ort
The primary difference noticable here is that the updating of the working tree and index is not done simultaneously with the merge algorithm, but is a separate post-processing step.
The new API is designed so that one can do repeated merges (e.g. during a rebase or cherry-pick) and only update the index and working tree one time at the end instead of updating it with every intermediate result.Also, one can perform a merge between two branches, neither of which match the index or the working tree, without clobbering the index or working tree.
The "ort" backend does the complete merge inmemory, and only updates the index and working copy as a post-processing step.
它确实可以处理文件冲突，file/Folder 重命名比以前更有效（使用默认的“递归”策略）。