go_three_way_merge

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)

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.