First sync

[meska]

I installed xPipe on one Mac, configured git sync, later installed it on a second Mac, after enabling sync on the second newly installed Mac it failed because the fetch could not update the local repo due to files already present.
So I had to delete them first by hand from the shell and then relaunch xPipe as there is no function available to overwrite the local repository.

[crschnick]

A possible merge conflict is expected, but you should get something like this

with a few options to automatically resolve the conflict. Did that not happen for you?

[meska]

I have instead this:

[crschnick]

Oh that is due to it not being in english, it currently only checks the error messages of git to determine what kind of error occurred. I might have to find an alternative here

[crschnick]

On the second mac, if you go into the storage directory and delete everything, including the .git, it should work.

[meska]

On the second mac, if you go into the storage directory and delete everything, including the .git, it should work.

Yes, in the end that's what I did and now it works.

[crschnick]

That will be fixed in the next release

[ghost]

Fixed in release version 9.2: https://github.com/xpipe-io/xpipe/releases/tag/9.2