Closed Byron closed 3 weeks ago
Implement an octopus merge based on trees, and (mostly) equivalent to merge-ORT in Git.
merge-ORT
Related to https://github.com/gitbutlerapp/gitbutler/pull/4793.
gix
gix_validate::path::component()
Everything is about MergeORT.
git2::MergeOptions
git2::merge_trees()
Implement an octopus merge based on trees, and (mostly) equivalent to
merge-ORT
in Git.Related to https://github.com/gitbutlerapp/gitbutler/pull/4793.
Tasks
gix
gix_validate::path::component()
Next PR
Research
Everything is about MergeORT.
git2::MergeOptions
.Handle Special Cases
Questions
Is
git2::merge_trees()
a trivial merge? Does it handle all the cases of MergeORT?How does rename-tracking affect a tree-merge?
How is an octopus merge implemented, particularly with Merge ORT?
References