#merge #tree #commit #algorithm #content #look #blob

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

#128 in Hardware support

Download history 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 133/week @ 2024-12-28 167/week @ 2025-01-04 157/week @ 2025-01-11 486/week @ 2025-01-18 352/week @ 2025-01-25 387/week @ 2025-02-01 223/week @ 2025-02-08 210/week @ 2025-02-15 221/week @ 2025-02-22 439/week @ 2025-03-01

1,131 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
~463K SLoC