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

gix-merge

A crate of the gitoxide project implementing merge algorithms

4 releases (breaking)

0.3.0 Jan 18, 2025
0.2.0 Dec 22, 2024
0.1.0 Nov 24, 2024
0.0.0 Oct 22, 2024

#217 in Hardware support

Download history 498/week @ 2024-10-21 458/week @ 2024-10-28 686/week @ 2024-11-04 527/week @ 2024-11-11 739/week @ 2024-11-18 675/week @ 2024-11-25 911/week @ 2024-12-02 645/week @ 2024-12-09 386/week @ 2024-12-16 275/week @ 2024-12-23 95/week @ 2024-12-30 182/week @ 2025-01-06 284/week @ 2025-01-13 382/week @ 2025-01-20 339/week @ 2025-01-27

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

MIT/Apache

1.5MB
24K 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–26MB
~452K SLoC