class

MdfMerge

Module
MDF
Header
#include "mdf/mdf_merge.h"
Namespace
MDF

Public functions

ReturnsNameDescription
boolMergeThree-way merge.

Function details

Merge

C++
static bool Merge(const MdfDocument& base, const MdfDocument& ours, const MdfDocument& theirs, MdfDocument& out, std::vector<MdfMergeConflict>& conflicts)

Three-way merge. out is always written — on a conflict it holds OUR side of each conflicting property or node, so a caller that accepts the result loses nothing it had. True when nothing conflicted.

Generated from mdf/mdf_merge.h via mdf.json · Oct 26, 2026Version 1.0.0