diff --git a/src/lib b/src/lib index bb9ed00..5ea74b5 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit bb9ed0047c7444db3a9fbc164fe981aee0208c51 +Subproject commit 5ea74b5d877edece5f852794ab4fe82a1978212f diff --git a/updates.md b/updates.md index 809b906..a2da009 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 only when it is actually newer than the incoming database entry and is not already represented in the revision history. + - 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. ## 0.25.79