From dbcbf2c5ca9642b1703703942195342bd547c529 Mon Sep 17 00:00:00 2001 From: vorotamoroz Date: Tue, 7 Jul 2026 12:05:40 +0000 Subject: [PATCH] fix: document safer conflict preservation --- src/lib | 2 +- updates.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib b/src/lib index 5ea74b5..a0efb72 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 5ea74b5d877edece5f852794ab4fe82a1978212f +Subproject commit a0efb7274e15c4ae0f0e0740670a1ad2699031e9 diff --git a/updates.md b/updates.md index a2da009..dd669b5 100644 --- a/updates.md +++ b/updates.md @@ -13,7 +13,7 @@ The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsid - When one side deletes a line and the other side modifies that same line, the conflict is preserved instead of silently choosing one side. - Fixed an issue where applying a newer database entry to storage could incorrectly preserve an older local file as a conflict (#994). - Behaviour change: - - Local storage is preserved as a conflict when it may contain unsynchronised changes that are not represented in the revision history. If the incoming database entry is clearly newer, it is applied to storage instead. + - Local storage is preserved as a conflict when it may contain unsynchronised changes that are not represented in the revision history. A newer incoming text entry is applied without creating a conflict only when it clearly extends the existing local text. ## 0.25.79