conflict happened and then no longer syncing #1123

Closed
jhhung opened this Issue Dec 25, 2012 · 1 comment

Comments

Projects
None yet
2 participants

jhhung commented Dec 25, 2012

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

Owner

hbons commented Jan 2, 2013

duplicate of #1108.

@hbons hbons closed this Jan 2, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment