Git Merge Commit with Recursive Strategy vs ORT strategy
When doing a git commit on two different versions of git I noticed that the commit message generated by git was different. In the newer versions, post 2024 versus older git versions like 2.30.x from 2020/2021 the merge strategy in git is different. Git Merge Commit uses a Recursive Strategy algorithm for performing merges. In newer versions of Git, e.g., 2.47.0 in November 2024 uses Optimized Recursive strategy (ORT). In earlier version of Git, e.g., 2.30.1 used Recursive Strategy. Example: The git message would be like "Merge made by 'ort' strategy (version 2.47.0) ORT strategy in git merge is an optimized version of the Recursive strategy where it identifies a merge base but employs an enhanced or more efficient algorithm for applying changes and resolving conflicts. Recursive strategy in git merge can sometimes lead to complex conflict resolutions, especially when branches have diverged significantly. Recursive strategy may also be slower due to its more extensive co...