andras/reconcile
andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Handle more trivial cases

Browse source
This commit is contained in:
Andras Schmelczer 2024-12-15 15:47:39 +00:00
commit 2083675c07
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/reconcile/src/operation_transformation/mod.rs
View file

@ -12,6 +12,14 @@ pub fn reconcile(original: &str, left: &str, right: &str) -> String {
return left.to_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 left_operations = EditedText::from_strings(original, left);
let right_operations = EditedText::from_strings(original, right); let right_operations = EditedText::from_strings(original, right);