From fdc63e730f91a4605ed4ff96a908e1f5e822d1bb Mon Sep 17 00:00:00 2001 From: Marcos Magueta Date: Mon, 20 Apr 2026 21:55:07 -0300 Subject: New Server & Manipulation refactor Co-authored-by: Estevan Castilho --- lib/management/merge.ml | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/management/merge.ml') diff --git a/lib/management/merge.ml b/lib/management/merge.ml index d30545a..a8860fe 100644 --- a/lib/management/merge.ml +++ b/lib/management/merge.ml @@ -10,6 +10,7 @@ type conflict = type strategy = PreferLeft | PreferRight | RevertToAncestor type merge_result = Clean of Database.t | Failed of conflict list +(* TODO: Remove this later. We already should have the interface on the manipulation *) (** Module type for the subset of Manipulation.Make we need. *) module type MANIPULATION = sig type storage -- cgit v1.2.3