File conflict happens every time, after editing same file on both device.

[Arco-san]

Abstract

File conflict happens every time, after editing same file on both device independently then sync.

Expected behaviour

• Everything synchronised
• Differential is merged automatically

Actually happened

• The popup "conflicting changes" appears.

Reproducing procedure

1. Establish settings.
2. Disconnecting sync, edit the file on both device.
3. Enable sync again, using P2P, connect and sync.

Report from the LiveSync

For more information, please refer to Making the report.

Report from hatch

<!-- # ---- Obsidian info ----
navigator: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) obsidian/1.5.12 Chrome/120.0.6099.283 Electron/28.2.3 Safari/537.36
fileSystem: insensitive

---
# ---- remote config ----
{}

---
# ---- Plug-in config ----
version: 0.25.32
remoteType: ONLY_P2P
useCustomRequestHandler: false
couchDB_URI: self-hosted
couchDB_USER: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
couchDB_PASSWORD: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
couchDB_DBNAME: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
liveSync: false
syncOnSave: true
syncOnStart: true
savingDelay: 200
lessInformationInLog: false
gcDelay: 0
versionUpFlash: ""
minimumChunkSize: 20
longLineThreshold: 250
showVerboseLog: true
suspendFileWatching: false
trashInsteadDelete: true
periodicReplication: false
periodicReplicationInterval: 60
syncOnFileOpen: false
encrypt: false
passphrase: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
usePathObfuscation: false
doNotDeleteFolder: false
resolveConflictsByNewerFile: false
batchSave: false
batchSaveMinimumDelay: 5
batchSaveMaximumDelay: 60
deviceAndVaultName: ""
usePluginSettings: false
showOwnPlugins: false
showStatusOnEditor: true
showStatusOnStatusbar: true
showOnlyIconsOnEditor: false
hideFileWarningNotice: false
usePluginSync: false
autoSweepPlugins: false
autoSweepPluginsPeriodic: false
notifyPluginOrSettingUpdated: false
checkIntegrityOnSave: false
batch_size: 25
batches_limit: 25
useHistory: true
disableRequestURI: true
skipOlderFilesOnSync: true
checkConflictOnlyOnOpen: false
showMergeDialogOnlyOnActive: false
syncInternalFiles: false
syncInternalFilesBeforeReplication: false
syncInternalFilesIgnorePatterns: \/node_modules\/, \/\.git\/, \/obsidian-livesync\/
syncInternalFilesTargetPatterns: ""
syncInternalFilesInterval: 60
additionalSuffixOfDatabaseName: e412b1c83735a10f
ignoreVersionCheck: false
lastReadUpdates: 25
deleteMetadataOfDeletedFiles: false
syncIgnoreRegEx: ""
syncOnlyRegEx: ""
customChunkSize: 0
readChunksOnline: true
watchInternalFileChanges: true
automaticallyDeleteMetadataOfDeletedFiles: 0
disableMarkdownAutoMerge: false
writeDocumentsIfConflicted: false
useDynamicIterationCount: false
syncAfterMerge: false
configPassphraseStore: ""
encryptedPassphrase: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
encryptedCouchDBConnection: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
permitEmptyPassphrase: false
useIndexedDBAdapter: false
useTimeouts: false
writeLogToTheFile: true
doNotPaceReplication: false
hashCacheMaxCount: 300
hashCacheMaxAmount: 50
concurrencyOfReadChunksOnline: 40
minimumIntervalOfReadChunksOnline: 50
hashAlg: xxhash64
suspendParseReplicationResult: false
doNotSuspendOnFetching: false
useIgnoreFiles: false
ignoreFiles: .gitignore
syncOnEditorSave: true
pluginSyncExtendedSetting: {}
syncMaxSizeInMB: 50
settingSyncFile: ""
writeCredentialsForSettingSync: false
notifyAllSettingSyncFile: false
isConfigured: true
settingVersion: 10
enableCompression: false
accessKey: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
bucket: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
endpoint: Not configured or AWS
region: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(4 letters)
secretKey: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷
useEden: false
maxChunksInEden: 10
maxTotalLengthInEden: 1024
maxAgeInEden: 10
disableCheckingConfigMismatch: false
displayLanguage: def
enableChunkSplitterV2: false
disableWorkerForGeneratingChunks: false
processSmallFilesInUIThread: false
notifyThresholdOfRemoteStorageSize: 800
usePluginSyncV2: false
usePluginEtc: false
doNotUseFixedRevisionForChunks: true
showLongerLogInsideEditor: false
sendChunksBulk: false
sendChunksBulkMaxSize: 1
useSegmenter: false
useAdvancedMode: false
usePowerUserMode: false
useEdgeCaseMode: false
enableDebugTools: false
suppressNotifyHiddenFilesChange: false
syncMinimumInterval: 2000
P2P_Enabled: true
P2P_AutoAccepting: 0
P2P_AppID: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(20 letters)
P2P_roomID: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(15 letters)
P2P_passphrase: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(11 letters)
P2P_relays: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(27 letters)
P2P_AutoBroadcast: false
P2P_AutoStart: false
P2P_AutoSyncPeers: ""
P2P_AutoWatchPeers: ""
P2P_SyncOnReplication: ""
P2P_RebuildFrom: ""
P2P_AutoAcceptingPeers: ""
P2P_AutoDenyingPeers: ""
P2P_IsHeadless: false
P2P_DevicePeerName: ""
P2P_turnServers: (1 servers configured)
P2P_turnUsername: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
P2P_turnCredential: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
doctorProcessedVersion: 0.25.27
bucketCustomHeaders: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
couchDB_CustomHeaders: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
useJWT: false
jwtAlgorithm: ""
jwtKey: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
jwtKid: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
jwtSub: 𝑅𝐸𝐷𝐴𝐶𝑇𝐸𝐷(0 letters)
jwtExpDuration: 5
useRequestAPI: false
bucketPrefix: ""
chunkSplitterVersion: ""
E2EEAlgorithm: v2
processSizeMismatchedFiles: false
forcePathStyle: true
syncInternalFileOverwritePatterns: "" -->

Obsidian debug info

Debug info

<!-- paste here -->

Plug-in log

We can see the log by tapping the Document box icon. If you noticed something suspicious, please let me know.
Note: Please enable Verbose Log. For detail, refer to Logging, please.

Plug-in log

<!-- 2025/12/4 19:30:31->[ConfigSync] All functions are properly bound
2025/12/4 19:30:31->[HiddenFileSync] All functions are properly bound
2025/12/4 19:30:31->[LocalDatabaseMaintenance] All functions are properly bound
2025/12/4 19:30:31->[P2PReplicator] All functions are properly bound
2025/12/4 19:30:31->[ModuleLiveSyncMain] Loaded
2025/12/4 19:30:31->[ModuleLiveSyncMain] All functions are properly bound
2025/12/4 19:30:31->[ModuleExtraSyncObsidian] Loaded
2025/12/4 19:30:31->[ModuleExtraSyncObsidian] All functions are properly bound
2025/12/4 19:30:31->[ModuleDatabaseFileAccess] Loaded
2025/12/4 19:30:31->[ModuleDatabaseFileAccess] All functions are properly bound
2025/12/4 19:30:31->[ModulePouchDB] Loaded
2025/12/4 19:30:31->[ModulePouchDB] All functions are properly bound
2025/12/4 19:30:31->[ModuleConflictChecker] Loaded
2025/12/4 19:30:31->[ModuleConflictChecker] All functions are properly bound
2025/12/4 19:30:31->[ModuleLocalDatabaseObsidian] Loaded
2025/12/4 19:30:31->[ModuleLocalDatabaseObsidian] All functions are properly bound
2025/12/4 19:30:31->[ModuleReplicatorMinIO] Loaded
2025/12/4 19:30:31->[ModuleReplicatorMinIO] All functions are properly bound
2025/12/4 19:30:31->[ModuleReplicatorCouchDB] Loaded
2025/12/4 19:30:31->[ModuleReplicatorCouchDB] All functions are properly bound
2025/12/4 19:30:31->[ModuleReplicator] Loaded
2025/12/4 19:30:31->[ModuleReplicator] All functions are properly bound
2025/12/4 19:30:31->[ModuleFileHandler] Loaded
2025/12/4 19:30:31->[ModuleFileHandler] All functions are properly bound
2025/12/4 19:30:31->[ModuleConflictResolver] Loaded
2025/12/4 19:30:31->[ModuleConflictResolver] All functions are properly bound
2025/12/4 19:30:31->[ModuleRemoteGovernor] Loaded
2025/12/4 19:30:31->[ModuleRemoteGovernor] All functions are properly bound
2025/12/4 19:30:31->[ModuleTargetFilter] Loaded
2025/12/4 19:30:31->[ModuleTargetFilter] All functions are properly bound
2025/12/4 19:30:31->Cache initialized 300 / 250000000000
2025/12/4 19:30:31->[ModulePeriodicProcess] Loaded
2025/12/4 19:30:31->[ModulePeriodicProcess] All functions are properly bound
2025/12/4 19:30:31->[ModuleKeyValueDB] Loaded
2025/12/4 19:30:31->[ModuleKeyValueDB] All functions are properly bound
2025/12/4 19:30:31->[ModuleInitializerFile] Loaded
2025/12/4 19:30:31->[ModuleInitializerFile] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianAPI] Loaded
2025/12/4 19:30:31->[ModuleObsidianAPI] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianEvents] Loaded
2025/12/4 19:30:31->[ModuleObsidianEvents] All functions are properly bound
2025/12/4 19:30:31->[ModuleFileAccessObsidian] Loaded
2025/12/4 19:30:31->[ModuleFileAccessObsidian] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianSettings] Loaded
2025/12/4 19:30:31->[ModuleObsidianSettings] All functions are properly bound
2025/12/4 19:30:31->[ModuleResolvingMismatchedTweaks] Loaded
2025/12/4 19:30:31->[ModuleResolvingMismatchedTweaks] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianSettingsAsMarkdown] Loaded
2025/12/4 19:30:31->[ModuleObsidianSettingsAsMarkdown] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianSettingDialogue] Loaded
2025/12/4 19:30:31->[ModuleObsidianSettingDialogue] All functions are properly bound
2025/12/4 19:30:31->[ModuleLog] Loaded
2025/12/4 19:30:31->[ModuleLog] All functions are properly bound
2025/12/4 19:30:31->[ModuleInputUIObsidian] Loaded
2025/12/4 19:30:31->[ModuleInputUIObsidian] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianMenu] Loaded
2025/12/4 19:30:31->[ModuleObsidianMenu] All functions are properly bound
2025/12/4 19:30:31->[ModuleRebuilder] Loaded
2025/12/4 19:30:31->[ModuleRebuilder] All functions are properly bound
2025/12/4 19:30:31->[ModuleSetupObsidian] Loaded
2025/12/4 19:30:31->[ModuleSetupObsidian] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianDocumentHistory] Loaded
2025/12/4 19:30:31->[ModuleObsidianDocumentHistory] All functions are properly bound
2025/12/4 19:30:31->[ModuleMigration] Loaded
2025/12/4 19:30:31->[ModuleMigration] All functions are properly bound
2025/12/4 19:30:31->[ModuleRedFlag] Loaded
2025/12/4 19:30:31->[ModuleRedFlag] All functions are properly bound
2025/12/4 19:30:31->[ModuleInteractiveConflictResolver] Loaded
2025/12/4 19:30:31->[ModuleInteractiveConflictResolver] All functions are properly bound
2025/12/4 19:30:31->[ModuleObsidianGlobalHistory] Loaded
2025/12/4 19:30:31->[ModuleObsidianGlobalHistory] All functions are properly bound
2025/12/4 19:30:31->[ModuleCheckRemoteSize] Loaded
2025/12/4 19:30:31->[ModuleCheckRemoteSize] All functions are properly bound
2025/12/4 19:30:31->[ModuleDev] Loaded
2025/12/4 19:30:31->[ModuleDev] All functions are properly bound
2025/12/4 19:30:31->[ModuleReplicateTest] Loaded
2025/12/4 19:30:31->[ModuleReplicateTest] All functions are properly bound
2025/12/4 19:30:31->[ModuleIntegratedTest] Loaded
2025/12/4 19:30:31->[ModuleIntegratedTest] All functions are properly bound
2025/12/4 19:30:31->[SetupManager] Loaded
2025/12/4 19:30:31->[SetupManager] All functions are properly bound
2025/12/4 19:30:31->[ModuleLiveSyncMain]  Loading plugin...
2025/12/4 19:30:31->[ModuleLiveSyncMain]  Self-hosted LiveSync v0.25.32 0.25.32
2025/12/4 19:30:31->xxhash for plugin initialised
2025/12/4 19:30:31->[ModuleLocalDatabaseObsidian]  Waiting for ready...
2025/12/4 19:30:31->HashManager for xxhash64 has been initialised
2025/12/4 19:30:31->HashManager for xxhash64 has been initialised
2025/12/4 19:30:32->Opening Database...
2025/12/4 19:30:32->Database info
2025/12/4 19:30:32->{
  "doc_count": 7636,
  "update_seq": 7959,
  "idb_attachment_format": "binary",
  "db_name": "Windows Vault-e412b1c83735a10f-livesync-v2",
  "auto_compaction": false,
  "adapter": "idb"
}
2025/12/4 19:30:32->HashManager for xxhash64 has been initialised
2025/12/4 19:30:32->ChunkManager initialised
2025/12/4 19:30:32->Database is now ready.
2025/12/4 19:30:33->[ModuleObsidianEvents]  Modifying callback of the save command
2025/12/4 19:30:33->[ModuleInitializerFile]  Opening the key-value database
2025/12/4 19:30:33->[ModuleInitializerFile]  Initialize and checking database files
2025/12/4 19:30:33->[ModuleInitializerFile]  Checking deleted files
2025/12/4 19:30:33->[ModuleInitializerFile]  Collecting local files on the storage
2025/12/4 19:30:33->[ModuleInitializerFile]  Collecting local files on the DB
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 25
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 50
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 75
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 100
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 125
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 150
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 175
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 200
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 225
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 250
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 275
2025/12/4 19:30:34->[ModuleInitializerFile]  Collecting local files on the DB: 300
2025/12/4 19:30:34->[ModuleInitializerFile]  Total files in the database: 320
2025/12/4 19:30:34->[ModuleInitializerFile]  Total files in the storage: 310
2025/12/4 19:30:34->[ModuleInitializerFile]  Total files: 321
2025/12/4 19:30:34->[ModuleInitializerFile]  Files exist only in storage: 1
2025/12/4 19:30:34->[ModuleInitializerFile]  Files exist only in database: 11
2025/12/4 19:30:34->[ModuleInitializerFile]  Files exist both in storage and database: 309
2025/12/4 19:30:34->[ModuleInitializerFile]  Synchronising...
2025/12/4 19:30:34->[ModuleInitializerFile]  UPDATE DATABASE
2025/12/4 19:30:34->[ModuleInitializerFile]  UPDATE STORAGE
2025/12/4 19:30:34->[ModuleInitializerFile]  SYNC DATABASE AND STORAGE
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 0. inbox/test bin/yoyogi.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 0. inbox/test bin/無題のファイル.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 2. Memos/2.2 Obsidian関連/addon メモ/無題のファイル.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/quickaddとtemplater比較.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/Task note folder/takoyama.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/Task note folder/ファイルパスフィルター.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/Task note folder/無題のファイル.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/Todo Pipeline canvas.canvas
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/Trilium note.md
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 3. ToDo関連/無題のファイル.md
2025/12/4 19:30:34->[ModuleInitializerFile]  UPDATE STORAGE: DONE:1, FAILED:0, LAST:10
2025/12/4 19:30:34->[ModuleInitializerFile]  Deletion history skipped: 8. 小メモ/無題のファイル.md
2025/12/4 19:30:34->[ModuleInitializerFile]  SYNC DATABASE AND STORAGE: 3. ToDo関連/Mobile instanote.canvas has conflicts. skipped
2025/12/4 19:30:34->[ModuleInitializerFile]  UPDATE STORAGE: DONE:1, FAILED:0, LAST:10
SYNC DATABASE AND STORAGE All done: DONE:309, FAILED:0
2025/12/4 19:30:36->[ModuleFileHandler]  File 3. ToDo関連/base as a task manager.base#done.md is not changed
2025/12/4 19:30:36->[ModuleInitializerFile]  Initialized, NOW TRACKING!
2025/12/4 19:30:36->[ModuleInitializerFile]  UPDATE STORAGE: DONE:1, FAILED:0, LAST:10
SYNC DATABASE AND STORAGE All done: DONE:309, FAILED:0
UPDATE DATABASE All done: DONE:1, FAILED:0
2025/12/4 19:30:36->Initializing...
2025/12/4 19:30:36->peerId: dKST3TNKo92gUr6TMjcQ Sending Advertisement to All
2025/12/4 19:30:36->Checking for compromised chunks...
2025/12/4 19:30:36->[ModuleMigration]  Incomplete docs check already done, skipping.
2025/12/4 19:30:36->Rule satisfied: sendChunksBulk is false
2025/12/4 19:30:36->Rule satisfied: sendChunksBulkMaxSize is 1
2025/12/4 19:30:36->Rule satisfied: doNotUseFixedRevisionForChunks is true
2025/12/4 19:30:36->Rule violation: handleFilenameCaseSensitive is undefined but should be false
2025/12/4 19:30:36->Rule satisfied: useEden is false
2025/12/4 19:30:36->Rule satisfied: hashAlg is xxhash64
2025/12/4 19:30:36->Rule satisfied: disableCheckingConfigMismatch is false
2025/12/4 19:30:36->Rule satisfied: enableCompression is false
2025/12/4 19:30:36->Rule violation: usePluginSyncV2 is false but should be true
2025/12/4 19:30:36->Rule violation: chunkSplitterVersion is  but should be v3-rabin-karp
2025/12/4 19:30:36->Rule condition satisfied: customChunkSize is 0, and detection function returned false
2025/12/4 19:30:36->Rule satisfied: E2EEAlgorithm is v2
2025/12/4 19:30:36->Issues found but marked as to be silent
2025/12/4 19:30:36->[ModuleLiveSyncMain]  Additional safety scan...
2025/12/4 19:30:36->[ModuleInteractiveConflictResolver]  Checking conflicted files
2025/12/4 19:30:36->HashManager for xxhash64 has been initialised
2025/12/4 19:30:36->[ModuleInteractiveConflictResolver]  Some files have been left conflicted! Please resolve them by "Pick a file to resolve conflict". The list is written in the log.
2025/12/4 19:30:36->[ModuleInteractiveConflictResolver]  Conflicted: 3. ToDo関連/Mobile instanote.canvas
2025/12/4 19:30:36->[ModuleCheckRemoteSize]  Checking storage sizes
2025/12/4 19:30:36->Trying to get remote status but P2P replication does not support to do this. This operation has been ignored
2025/12/4 19:30:36->[ModuleLiveSyncMain]  Additional safety scan completed
2025/12/4 19:30:38->Initializing...
2025/12/4 19:30:38->peerId: dKST3TNKo92gUr6TMjcQ Sending Advertisement to All
2025/12/4 19:30:42->peerId: dKST3TNKo92gUr6TMjcQ Sending Advertisement to oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:43->Advertisement from oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:46->P2P Requesting Authentication to oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:46->P2P Replicating from oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:46->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2
Source: iphone8 shl-documents/iphone8 shl-livesync-v2 (7787)
Target: Windows Vault-e412b1c83735a10f-livesync-v2 (7959)
2025/12/4 19:30:46->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 with mark 1764337073190
2025/12/4 19:30:46->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 / since 7787
2025/12/4 19:30:46->Replication has been completed
2025/12/4 19:30:46->P2P Replication from oMK32VlRYTJzoEkBnwy6 has been completed
2025/12/4 19:30:46->P2P Replication has been requested to oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:47->P2P Replication has been done
2025/12/4 19:30:48->P2P Requesting Authentication to oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:49->P2P Replicating from oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:49->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2
Source: iphone8 shl-documents/iphone8 shl-livesync-v2 (7787)
Target: Windows Vault-e412b1c83735a10f-livesync-v2 (7959)
2025/12/4 19:30:49->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 with mark 1764337073190
2025/12/4 19:30:49->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 / since 7787
2025/12/4 19:30:49->Replication has been completed
2025/12/4 19:30:49->P2P Replication from oMK32VlRYTJzoEkBnwy6 has been completed
2025/12/4 19:30:49->P2P Replication has been requested to oMK32VlRYTJzoEkBnwy6
2025/12/4 19:30:49->P2P Replication has been done
2025/12/4 19:30:56->Log window opened -->

Network log

Network logs displayed in DevTools will possibly help with connection-related issues. To capture that, please refer to DevTools.

Screenshots

If applicable, please add screenshots to help explain your problem.

Other information, insights and intuition.

I'm using P2P connection only.
The log files are from PC. The other device is iOS.
Conflict happens every format of data, even if not canvas.

[vrtmrz]

Thank you for opening the issue! I am happy to hear that using P2P synchronisation.
Automatic merging only accepts no-overwrapped changes of *.md which have a common base revision (and at *.canvas, *.json, only detected changes as JSON that can be identified -- Arrays might always be in conflict). If not, the plug-in prompts us. Is it possible to clear this condition? For example, the following changes will be resolved automatically.

 - [ ] Apple
 - [ ] Bagle
- - [ ] Cookie
+ - [v] Cookie

and

- - [ ] Apple
+ - [v] Apple
 - [ ] Bagle
 - [ ] Cookie

However, the following requires manual resolution.

 - [ ] Apple
 - [ ] Bagle
- - [ ] Cookie
+ - [ ] Cornflake

and

 - [ ] Apple
 - [ ] Bagle
- - [ ] Cookie
+ - [v] Cookie

And, revisions of the file which have not been synchronised before also cannot be automated.

[Arco-san]

I'm sorry, but I can't answer your question because I don't understand the terminology or the conditions you're describing. I don't understand the meaning of "common base revision" or difference between the first and fourth examples you provided.

I tested the sync for now, and found that simply adding a line doesn't cause a conflict, but editing adjacent lines in a file from different devices causes an error. This is similar to the situation where automatic merging doesn't work, so it appears to be working as intended.

My initial problem seems to be resolved, but is there any way to fix this conflict? I have a few related questions.

1. Obsidian has three SHLS commands: "Resolve if conflicted", "Resolve all conflicted files", and "Pick a file to resolve conflict". What do these commands do?
2. All of these commands just prompt me with "conflicted changes (filepath)" and don't resolve the conflict. Is this correct?
3. Is "Setting > Hatch > Recovery and Repair > Resolve All conflicted files by the newer one" the only way to actually resolve conflicts? Are there any other ways to automatically resolve conflicts using SHLS commands or settings?
4. Once a conflict occurs, a prompt will appear every time you edit that file. Is this correct?
5. Is there a setting to suppress the prompt that appears when editing a conflicted file?

Thanks in advance!

[TeoConan]

Same problem here, I configured two client (A & B) on a CouchDb server
When I (A) write in my file, I got continually a notification about a merge

Worst of all : sometime if my write is too fast, it override my last word, for example :

• I type: Hello
• Then I type quickly : Hello world everybody
• The time it upload correctly I got : Hello world

It seems to remove "everybody" because a first request has been sent with "Hello world" while I'm typing, then I receive my own update (this might be the bug here), and so even if I wrote "everybody", my "update" merge with "Hello world"
I don't know if my explanation is understandable ! Let me know if you need more details

It didn't happened in the last version by the way, if it can help

[Arco-san]

Worst of all : sometime if my write is too fast, it override my last word, for example :

* _I type:_ Hello

* _Then I type quickly :_ Hello _world everybody_

* _The time it upload correctly I got :_ Hello world

It seems to remove "everybody" because a first request has been sent with "Hello world" while I'm typing, then I receive my own update (this might be the bug here), and so even if I wrote "everybody", my "update" merge with "Hello world" I don't know if my explanation is understandable ! Let me know if you need more details

It didn't happened in the last version by the way, if it can help

This issue happens in my environment too. It seems it should be submitted as separated issue and really haven't isolated the problem exactly, though.

[vrtmrz]

Thank you for the detail!
I have found an issue that a pended batched database update would not be processed before synchronisation.
Still, I have not got the actual cause of this issue, but it may be related.
This will be fixed in the next version (I should rewrite these functions, now mostly 3/4 completed).

And I will also explain the differences between these features. I beg your pardon for the delayed reply!

[vrtmrz]

Sorry for being delayed!
In v0.25.34, which was released yesterday, this may be some improvements. File event management and replication event management have been rewritten and have become more robust, with lower memory and CPU consumption.
Would you mind if I asked you to check the behaviour and situation changes, please?

[Arco-san]

Thank you for your response. Updated to v0.25.34 on both device, but I couldn't see the difference. It seems to be working as you have already explained.
With canvas, it seems that conflicts occur just by moving cards separately on each device.
I've attached a new log file. You can see the error messages I get when I start a sync on a vault file that already has conflicts, and then try to resolve the conflicts using the obsidian command.

Log

2025/12/13 0:59:26->Initializing...
2025/12/13 0:59:26->peerId: QYPtyu6HHg0E7M9dPUGt Sending Advertisement to All
2025/12/13 0:59:27->peerId: QYPtyu6HHg0E7M9dPUGt Sending Advertisement to qbu2nzObcRJJmnfgnrdX
2025/12/13 0:59:27->Advertisement from qbu2nzObcRJJmnfgnrdX
2025/12/13 0:59:28->P2P Requesting Authentication to qbu2nzObcRJJmnfgnrdX
2025/12/13 0:59:29->P2P Replicating from qbu2nzObcRJJmnfgnrdX
2025/12/13 0:59:29->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2
Source: iphone8 shl-documents/iphone8 shl-livesync-v2 (8785)
Target: Windows Vault-e412b1c83735a10f-livesync-v2 (9391)
2025/12/13 0:59:29->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 with mark 1764337073190
2025/12/13 0:59:29->Replication from iphone8 shl-documents/iphone8 shl-livesync-v2 to Windows Vault-e412b1c83735a10f-livesync-v2 / since 8785
2025/12/13 0:59:29->Replication has been completed
2025/12/13 0:59:29->P2P Replication from qbu2nzObcRJJmnfgnrdX has been completed
2025/12/13 0:59:29->P2P Replication has been requested to qbu2nzObcRJJmnfgnrdX
2025/12/13 0:59:29->P2P Replication has been done
2025/12/13 0:59:39->Sensible merge is not applicable.
2025/12/13 0:59:39->[ModuleConflictResolver]  conflict(s) found:3. ToDo関連/Task note folder/同期テストファイル.md
2025/12/13 0:59:39->[ModuleConflictResolver]  [conflict] Manual merge required!
2025/12/13 0:59:39->[ModuleInteractiveConflictResolver]  Merge:open conflict dialog
2025/12/13 0:59:39->Error in Switch handler for resolveByUserInteraction
2025/12/13 0:59:39->TypeError:div2.setHTMLUnsafe is not a function
[StackTrace]: _LiveSyncError: [Error Logged]: div2.setHTMLUnsafe is not a function
    at eval (plugin:obsidian-livesync:18:348509)
    at Logger (plugin:obsidian-livesync:6:50)
    at Switch.invoke (plugin:obsidian-livesync:18:1478922)
    at async eval (plugin:obsidian-livesync:18:1200340)
    at async nextTask (plugin:obsidian-livesync:6:29741)
[CausedBy]: TypeError: div2.setHTMLUnsafe is not a function
    at ConflictResolveModal.onOpen (plugin:obsidian-livesync:18:422588)
    at e.open (app://obsidian.md/app.js:1:1221328)
    at eval (plugin:obsidian-livesync:18:1202823)
    at nextTask (plugin:obsidian-livesync:6:29747)
    at serialized (plugin:obsidian-livesync:6:30026)
    at ModuleInteractiveConflictResolver._anyResolveConflictByUI (plugin:obsidian-livesync:18:1202637)
    at Switch.invoke (plugin:obsidian-livesync:18:1478817)
    at ObsidianConflictService.eval [as resolveByUserInteraction] (plugin:obsidian-livesync:18:1480860)
    at eval (plugin:obsidian-livesync:18:1200369)
    at async nextTask (plugin:obsidian-livesync:6:29741)
2025/12/13 0:59:43->Conflicted key:data.nodes.�__ARRAY.76f9227a2294516a.x
2025/12/13 0:59:43->Object merge is not applicable..
2025/12/13 0:59:43->[ModuleConflictResolver]  conflict(s) found:3. ToDo関連/Mobile instanote.canvas
2025/12/13 0:59:43->[ModuleConflictResolver]  [conflict] Manual merge required!
2025/12/13 0:59:43->[ModuleInteractiveConflictResolver]  Merge:open conflict dialog
2025/12/13 0:59:43->Error in Switch handler for resolveByUserInteraction
2025/12/13 0:59:43->TypeError:div2.setHTMLUnsafe is not a function
[StackTrace]: _LiveSyncError: [Error Logged]: div2.setHTMLUnsafe is not a function
    at eval (plugin:obsidian-livesync:18:348509)
    at Logger (plugin:obsidian-livesync:6:50)
    at Switch.invoke (plugin:obsidian-livesync:18:1478922)
    at async eval (plugin:obsidian-livesync:18:1200340)
    at async nextTask (plugin:obsidian-livesync:6:29741)
[CausedBy]: TypeError: div2.setHTMLUnsafe is not a function
    at ConflictResolveModal.onOpen (plugin:obsidian-livesync:18:422588)
    at e.open (app://obsidian.md/app.js:1:1221328)
    at eval (plugin:obsidian-livesync:18:1202823)
    at nextTask (plugin:obsidian-livesync:6:29747)
    at serialized (plugin:obsidian-livesync:6:30026)
    at ModuleInteractiveConflictResolver._anyResolveConflictByUI (plugin:obsidian-livesync:18:1202637)
    at Switch.invoke (plugin:obsidian-livesync:18:1478817)
    at ObsidianConflictService.eval [as resolveByUserInteraction] (plugin:obsidian-livesync:18:1480860)
    at eval (plugin:obsidian-livesync:18:1200369)
    at async nextTask (plugin:obsidian-livesync:6:29741)

[vrtmrz]

Thank you so much for reporting this! And, sorry for being late!
Finally, I found the cause was that the API I had chosen was in the log you had shared, thankfully. (This API can only be used in recent devices).
I will fix this issue soon.