Steps to reproduce
- Create a new daily note on desktop app and type in it.
- Switch Android phone flight mode ON.
- Create a new daily note on Android phone (on the same day) and type in it.
- Switch Android phone flight mode OFF
- Once sync happens, note that Obsidian merge strategy deletes on of the notes.
Did you follow the troubleshooting guide? Yes
I can’t use sandbox mode to replicate this bug as it uses sync.
Expected result
The notes should be auto-merged using a strategy of your choice (suggestion: just combine the notes, one after the other).
Actual result
Merge conflict is resolved by silently discarding one note.
Environment
Windows desktop app
SYSTEM INFO:
Obsidian version: v1.6.7
Installer version: v1.4.13
Operating system: Windows 10 Pro 10.0.22631
Login status: logged in
Catalyst license: none
Insider build toggle: off
Live preview: on
Base theme: adapt to system
Community theme: none
Snippets enabled: 2
Restricted mode: off
Plugins installed: 5
Plugins enabled: 3
1: Toggle Case v1.1.0
2: Recent Files v1.4.1
3: Better Word Count v0.10.1
Android app
SYSTEM INFO:
Operating system: android 9 (samsung SM-G950F)
Obsidian version: 1.6.7 (149)
API version: v1.6.7
Login status: logged in
Catalyst license: none
Live preview: on
Base theme: dark
Community theme: none
Snippets enabled: 0
Restricted mode: on
Additional information
You can see the current basic merge strategy implementation in this image:
I was asked to create this bug report by [email protected].