go_three_way_merge

package module

v0.0.0-...-8a77db9 Latest Latest Go to latest Published: May 23, 2018 License: MIT Imports: 3 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

Repository

github.com/charlesvdv/go-three-way-merge

Links

Open Source Insights

README ¶

go-three-way-merge

A library performing three-way merge on unstructured data (mostly texts). For more information about three-way merging, check information here.

Documentation ¶

Overview ¶

Package go_three_way_merge implements an intuitive three way merging algorithm. See https://en.wikipedia.org/wiki/Merge_(version_control)#Three-way_merge for more detail.

Index ¶

func Merge(base, versionA, versionB string) (string, bool, error)
func MergeRunes(base, versionA, versionB []rune) (string, bool, error)

Constants ¶

This section is empty.

Variables ¶

This section is empty.

Functions ¶

func Merge ¶

func Merge(base, versionA, versionB string) (string, bool, error)

Merge two versions of the same base file. Returns the resulting merged file if the boolean is true. If the boolean is false, there is either a merge-conflict or an error. In theory, this algorithm should never return an error (if so, feel free to open an issue).

func MergeRunes ¶

func MergeRunes(base, versionA, versionB []rune) (string, bool, error)

MergeRunes provides the same functionality as `Merge` with runes instead of string.

Types ¶

This section is empty.

Source Files ¶

View all Source files

?	: This menu
/	: Search site
f or F	: Jump to
y or Y	: Canonical URL