merge

Documentation

Index

• type MergeResult
  • func MergeTree(storage storer.EncodedObjectStorer, tree1, tree2 *object.Tree, ...) (*MergeResult, error)

Types

type MergeResult

type MergeResult struct {
	// NewHashes are the OIDs that are newly created as a part of the merge operation.
	//
	// These include only the tree hashes that are newly created in the operation. If the
	// resolver creates new blobs or trees, they are not included in this list.
	NewHashes []plumbing.Hash

	FilesPickedEntry1  []string
	FilesPickedEntry2  []string
	FilesPickedEntry12 []string
	FilesConflict      []string

	// Tree is the result of the merge.
	TreeHash plumbing.Hash
}

MergeResult represents the result of a merge operation.

func MergeTree

func MergeTree(
	storage storer.EncodedObjectStorer,
	tree1, tree2 *object.Tree,
	mergeBase *object.Tree,
	conflictResolver resolver,
) (*MergeResult, error)

MergeTree executes a three-way merge of two trees.