merge

package

v0.0.5 Latest Latest Go to latest Published: Mar 4, 2021 License: AGPL-3.0 Imports: 11 Imported by: 0

Details

Valid go.mod file

The Go module system was introduced in Go 1.11 and is the official dependency management solution for Go.
Redistributable license

Redistributable licenses place minimal restrictions on how software can be used, modified, and redistributed.
Tagged version

Modules with tagged versions give importers more predictable builds.
Stable version

When a project reaches major version v1 it is considered stable.
Learn more about best practices

This section is empty.

This section is empty.

func Base(ctx context.Context, ds ipld.NodeGetter, local, remote cid.Cid) (cid.Cid, error)

Base returns the best common ancestor of local and remote.

func File(ctx context.Context, ds ipld.DAGService, o, a, b cid.Cid) (ipld.Node, error)

File combines the contents of two edited files into the original.

func Tree(ctx context.Context, ds ipld.DAGService, o, a, b cid.Cid) (ipld.Node, error)

Tree combines the changes to trees a and b onto the base o.

This section is empty.