Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/b... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

kuahyeow on Dec 14, 2023 | parent | context | favorite | on: The state of merging technology

Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ?

juped on Dec 14, 2023 [–]

histogram is a diff algorithm

skywal_l on Dec 14, 2023 | [–]

From the article:

> switch the default 3 way merge algorithm to histogram

toomim on Dec 15, 2023 | | [–]

Yeah, that was poorly written and confused me too.

It should say "switch the default diff algorithm to histogram." The diff algorithm is used within the recursive 3-way merge algorithm.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact