TechPrufer
Get started
Palantir
Palantir logoPalantir · Feature trail

Git Merge Machinery Optimization

2 posts · Aug 2021

What this trail covers

This post details the fifth iteration of optimizing Git's merge machinery, focusing on 'tree-level merging' and deferring recursion into directories modified on only one side. It introduces optimizations for trivial merges (where file/directory hashes match across all three merge sides) and modified-on-one-side merges. The new algorithm leverages hash comparisons to avoid content inspection for identical files/directories. It also introduces a strategy to defer recursion into directories modified on only one side.

All Palantir trails
  1. Optimizing Git’s Merge Machinery, #5Introduced 'tree-level merging' by leveraging Git's tree and blob hashes to identify trivial merges where file/directory content doesn't need inspection. Implemented a strategy to defer recursion into directories modified on only one side, allowing for trivial directory resolution if no relevant renames are detected. Extended this optimization to cases with cached renames from rebasing/cherry-picking operations.
  2. MediumIntroduces optimizations for Git's merge machinery by implementing 'tree-level merging' and deferring recursion into directories modified on only one side. This includes optimizations for trivial merges and modified-on-one-side merges by leveraging hash comparisons to avoid content inspection for identical files/directories.