#merge #tree #commit #content #file-content #algorithm #look

gix-merge

A crate of the gitoxide project implementing merge algorithms

3 releases (breaking)

0.2.0 Dec 22, 2024
0.1.0 Nov 24, 2024
0.0.0 Oct 22, 2024

#175 in Hardware support

Download history 419/week @ 2024-10-19 467/week @ 2024-10-26 645/week @ 2024-11-02 554/week @ 2024-11-09 600/week @ 2024-11-16 753/week @ 2024-11-23 847/week @ 2024-11-30 807/week @ 2024-12-07 332/week @ 2024-12-14 311/week @ 2024-12-21 104/week @ 2024-12-28

1,731 downloads per month
Used in 3 crates (via gix)

MIT/Apache

1.5MB
23K SLoC

Provide facilities to merge blobs, trees and commits.

  • blob-merges look at file content.
  • tree-merges look at trees and merge them structurally, triggering blob-merges as needed.
  • commit-merges are like tree merges, but compute or create the merge-base on the fly.

Dependencies

~14–25MB
~429K SLoC