Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

Cannot sync because of local changes #61

Open
orgi opened this issue Nov 27, 2020 · 2 comments
Open

Cannot sync because of local changes #61

orgi opened this issue Nov 27, 2020 · 2 comments
Assignees
Labels
bug Something isn't working

Comments

@orgi
Copy link

orgi commented Nov 27, 2020

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.

  1. Where can I find that repository on my local disk?
  2. 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

  1. Hint about the repository location in the case of a git error
  2. Option(s) to handle this kind of situation
@orgi orgi added the bug Something isn't working label Nov 27, 2020
@nicosommi
Copy link

nicosommi commented Jan 11, 2021

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.

@orgi
Copy link
Author

orgi commented Jan 19, 2021

@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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

3 participants