#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

#157 in Hardware support

Download history 130/week @ 2024-10-16 554/week @ 2024-10-23 525/week @ 2024-10-30 612/week @ 2024-11-06 475/week @ 2024-11-13 852/week @ 2024-11-20 711/week @ 2024-11-27 873/week @ 2024-12-04 552/week @ 2024-12-11 371/week @ 2024-12-18 145/week @ 2024-12-25 162/week @ 2025-01-01 165/week @ 2025-01-08

951 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

~15–25MB
~438K SLoC