-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Closed
Labels
bugA problem with current functionality, as opposed to missing functionality (enhancement)A problem with current functionality, as opposed to missing functionality (enhancement)frozen-due-to-ageIssues closed and untouched for a long time, together with being locked for discussionIssues closed and untouched for a long time, together with being locked for discussionneeds-triageNew issues needed to be validatedNew issues needed to be validated
Description
I'm encountering something similar to OP in #4305 where Android keep creating conflict for files modified from MacOS with Obsidian.
Behavior
- Use Obisidian to manage note on MacOS (use markdown files)
- Obsidian modify a file
- MacOS Syncthing detect change file and sync it
- Android Syncthing get the changes but trigger a conflict
- MacOS Syncthing sync back the *.sync-conflict file
- the sync-conflict contains the previous version of the file
- Android hasn't been used to modify the file
- I also have a linux machine with syncthing, no issue there, never create conflict, happy with the updated file.
Unsuccessful workaround
- Disabled Watch for change on android
- Sync conflict created on syncing from MacOS
- Pause the sync on android
- Sync conflict created when unpaused
System Info
Android
Syncthing: v1.22.0-rc2
Hardware: Pixel 4a 5G
OS: Android 13 (No custom rom, default from Google).
Configuration: Watch for changes, Ignore Permissions
MacOS
Syncthing: v1.22.0-1
OS: MacOS 12.6
Hardware: Apple M1 Max 64Gb
Configuration: Watch for changes, Ignore Permissions
Linux
Syncthing: v1.22.0-1
OS: Debian 11
Hardware: armhf
Metadata
Metadata
Assignees
Labels
bugA problem with current functionality, as opposed to missing functionality (enhancement)A problem with current functionality, as opposed to missing functionality (enhancement)frozen-due-to-ageIssues closed and untouched for a long time, together with being locked for discussionIssues closed and untouched for a long time, together with being locked for discussionneeds-triageNew issues needed to be validatedNew issues needed to be validated