merge.hpp File Reference

Merge commit functionality for the oxy sync container library. More...

Classes
struct	oxy::sync::merge_commit_fn
	Function object for performing a merge commit operation. More...

Namespaces
namespace	oxy::sync
	This namespace contains synchronization-related functionality for the oxy library.

Typedefs
using	oxy::sync::merge_callback
	Callback to resolve potential conflict.

Variables
constexpr merge_commit_fn	oxy::sync::merge_commit
	A constexpr instance of the merge_commit_fn function object for use in functional programming.

Detailed Description

Merge commit functionality for the oxy sync container library.

This header defines the merge_commit_fn structure, which provides a function object for performing a merge commit operation. It includes a callback type merge_callback for resolving potential conflicts during the merge process. The merge_commit_fn functor takes a connection pointer, identifiers of the current and other commits, and a callback function to resolve potential conflicts.