yeah a fix for the sync

This commit is contained in:
fyears 2024-06-11 00:44:19 +08:00
parent 08b68e224d
commit c9080dae4e

View File

@ -1172,7 +1172,7 @@ const dispatchOperationToActualV3 = async (
r.key
);
if (conflictAction === "smart_conflict") {
if (isMergable(r.remote!)) {
if (isMergable(r.local!)) {
await clearFileContentHistoryByVaultAndProfile(
db,
vaultRandomID,