Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

conflict happened and then no longer syncing #1123

Closed
jhhung opened this Issue · 1 comment

2 participants

@jhhung

After one of my friend make a conflict edit in a folder, then the folder is no longer syncing.
Each of us can still see edit by his own, but can not see by others'.
The debug log claim the conflict is resolved, but the same message shown in every attempt of syncing.

We are all in version 1.0.

The debug log:

21:22:29 | Git | jhh_lab | Conflict detected, trying to get out...21:22:29 | Git | jhh_lab | Conflict resolved
21:22:29 | Cmd | jhh_lab | git --exec-path="/Applications/SparkleShare.app/Contents/Resources/git/libexec/git-core" config core.ignorecase false
21:22:29 | SyncDown | jhh_lab | Done

@hbons
Owner

duplicate of #1108.

@hbons hbons closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.