Crate gix_merge

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.

Modules

• blob
• commit
• tree

Functions

• commit
  Like tree(), but it takes only two commits, our_commit and their_commit to automatically compute the merge-bases among them. If there are multiple merge bases, these will be auto-merged into one, recursively, if allow_missing_merge_base is true.
• tree
  Perform a merge between our_tree and their_tree, using base_tree as merge-base. Note that base_tree can be an empty tree to indicate ‘no common ancestor between the two sides’.