Git 2.56 speeds up merge-base search up to 70× and makes conflict resolution safer
Git 2.56 adds git add --resolved, which refuses to stage a file that still carries conflict markers, and optimizes merge-base computation by up to 70× on monorepos. Update your tooling and evaluate path-walk repacking if you host large repositories.