Git.MergeTreeResult (git v0.6.0)

Copy Markdown View Source

Result of Git.merge_tree/3 (git merge-tree --write-tree).

Represents a three-way merge performed entirely in the object database, with no working tree or index involvement:

  • :tree - SHA of the resulting merged tree (written to the object database regardless of conflicts)
  • :clean - true when the merge had no conflicts, false otherwise
  • :conflicts - the paths that conflicted (empty when :clean is true)

Summary

Types

t()

Types

t()

@type t() :: %Git.MergeTreeResult{
  clean: boolean(),
  conflicts: [String.t()],
  tree: String.t()
}