merge

Documentation

Overview

This package provides the procedures used to merge different versions of a generated configuration. Usually this is needed when you have both updated the YAML outputs and updated the spec file containing the definition for how they are generated.

This is like git merge: the idea is to find a common ancestor, then find the changes made from that "base" to obtain the resources in the working directory ("theirs") and apply those chnges to the resources generated by the spec file as modified ("ours").

Index

• func Merge(mineNodes, origNodes, yoursNodes []*yaml.RNode) ([]*yaml.RNode, error)

Functions

func Merge

func Merge(mineNodes, origNodes, yoursNodes []*yaml.RNode) ([]*yaml.RNode, error)

Merge takes three sets of resources -- mine (aka dest), orig (aka base, aka older), and yours (aka updated) -- and does a three-way merge. It returns an error if the merge has conflicts.

See https://www.gnu.org/software/diffutils/manual/html_node/diff3-Merging.html for more information about three-way merge.

TODO don't fail utterly when there's conflicts; report the conflicts instead, or add conflict markers somehow.