Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

SparkleShare creates conflicts by itself #1087

Closed
mrtnmueller opened this Issue Nov 30, 2012 · 5 comments

Comments

Projects
None yet
2 participants

When I'm the only author working on a specific file, one would expect that no conflict can arise. Still, through the way SparkleShare works, they cann occur.

Let's take a Word document. I edit in this document and save from time to time. Then a new version gets uploaded to the git repo, but afterwards it pulls again an tries to merge. Now, if Word auto-saved (or I hit save too fast again) in between the push and the pull, the merge will fail and a conflict is created. In my opinion, SparkleShare should not pull files that are opened on the target computer at the moment.

OS: Win 7 x64
Version: 0.9.5

Owner

hbons commented Nov 30, 2012

i can't do much about this because MS Office apps lock files. the only way around this is to create a copy. there's no way to know the difference between user made changes on the other side and autosaves either...

@hbons hbons closed this Nov 30, 2012

This also happens for non-binaryfiles (e.g. text files). The problem about the conflicts is mainly, that no 2nd file is created but SparkleShare will just stop working until you manually resolve the conflictby moving out the files, deleting the .lock file and movin back in.

Owner

hbons commented Nov 30, 2012

i think this has been fixed already. you should try the latest version.

I found this comment

Defer receiving changes when affected files are locked and show a warning in the statusicon (mostly affects Windows)

in the changelog. Still, there is no 0.9.8 out for Windows as of now.

Owner

hbons commented Nov 30, 2012

yea, i don't have access to a Windows machine right now to create an installer.

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