Vinzent03
[Bug]: Phantom Merge Conflict on Mobile
Describe the bug
On iOS, I have no local or staged changes. However, when I pull from the remote, I get an error saying there are Merge Conflicts. This should not be the case since there are no local changes. This is a problem because it does not pull the latest stuff, and I fear that if I make a change on mobile and push it, I'll lose all the data from other devices (see #558). The only remedy is to delete the vault and set it up from scratch.
I'm not sure how I got into this situation and I'm not able to reproduce it in a clean repo. However, I have kept my vault intact on mobile so I can run any tests and get more information if that will be helpful.
Screenshot attached
Relevant errors (if available) from notifications or console (CTRL+SHIFT+I)
No response
Steps to reproduce
- Open iOS app
- Pull changes
Expected Behavior
Changes should pull successfully without saying there are conflicts.
Addition context
No response
Operating system
iOS
Installation Method
Other
Plugin version
2.20.5
You should be able to use the files app to make a copy of your vault with a different name. This would allow you to reset your vault so it is usable, while keeping a version for testing when somebody that maintains this gets back to you.
