diff --git a/backend/reconcile/src/operation_transformation/mod.rs b/backend/reconcile/src/operation_transformation/mod.rs index 1161906..a0c0843 100644 --- a/backend/reconcile/src/operation_transformation/mod.rs +++ b/backend/reconcile/src/operation_transformation/mod.rs @@ -12,6 +12,14 @@ pub fn reconcile(original: &str, left: &str, right: &str) -> String { return left.to_string(); } + if original == left { + return right.to_string(); + } + + if original == right { + return left.to_string(); + } + let left_operations = EditedText::from_strings(original, left); let right_operations = EditedText::from_strings(original, right);