Cannot sync because of local changes
Syncify Version and Operating System
I am using Syncify v4.0.4 on Windows 10 2004
Describe the bug
I get the following error message when trying to download the settings (from a locally hosted git repo):
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
However there's no hint where to find the local copy of the repository, I searched for it but without luck.
- Where can I find that repository on my local disk?
- Once I found it - possibly we could check how it came to those local changes in the first place
To Reproduce
Unfortunately I cannot tell. Just was syncing the settings from two different machines over the network. Not sure how it came here.
Expected behavior
- Hint about the repository location in the case of a git error
- Option(s) to handle this kind of situation
In macos that path is /Users/<username>/Library/Application Support/VSCodium/User/globalStorage/arnohovhannisyan.syncify/repo
(bare in mind that I use VsCodium, so you better adjust that part to your particular vscode version)
I solved that manually using git and after that it started to work again.
@nicosommi Thanks for the hint.
For Windows that path would be: c:\\Users\\<username>\\AppData\\Roaming\\Code\\User\\globalStorage\\arnohovhannisyan.syncify\\repo
would not have expected this to be located in the 'Roaming' folder.