oxy::sync::api::plugin::merge_api Struct Reference

Interface for a merge API that resolves conflicts between data streams. More...

#include <plugin.hpp>

Public Member Functions
virtual maybe< stream_t >	resolve (param_t const &ancestor, param_t const &our, param_t const &other)=0
	Resolve conflicts between ancestor, our, and other parameters.

Detailed Description

Interface for a merge API that resolves conflicts between data streams.

This abstract class defines the interface for a merge API, which provides a method to resolve conflicts between ancestor, our, and other versions of parameters. Implementations of this interface must provide the resolve method to perform the merge operation.

Member Function Documentation

resolve()

virtual maybe< stream_t > oxy::sync::api::plugin::merge_api::resolve ( param_t const & ancestor, param_t const & our, param_t const & other )

pure virtual

Resolve conflicts between ancestor, our, and other parameters.

Parameters

ancestor	- The ancestor version of the parameters.
our	- The our version of the parameters.
other	- The other version of the parameters.

Returns

The resolved data stream, or an empty value if the conflict could not be resolved.