mikebarber1

Fixing .conflict Files

Recommended Posts

I have attempted to resolve .Conflict files using the steps provided in the article below.

 

http://sync-help.bittorrent.com/customer/portal/articles/1596830-conflict-files-in-sync

 

Each time I move the file out of the sync dir and then back one the other machine will create the file with .conflict in the file name.

 

Does anyone know how to fix this since the article describing how to fix this doesn't fix the issue?

 

Is there a way to disable .Conflict files, I do not need that part of the sync technology. Later timestamp wins no matter what type syncing?

Share this post


Link to post
Share on other sites

mikebarber1,

 

What are your machines? 

If it's a windows, do you have symlinks there? Is it them where conflicts are created? 

Share this post


Link to post
Share on other sites

Once the .conflict occurs I can delete the file and it disappears on both ends. At this point if I create a file using the non .Conflict name on either end the other end will create a .Conflict file on the other computer. Essentially once a .Conflict happens it is permanent, I have to live with a .Conflict at one or the other machine.

Share this post


Link to post
Share on other sites

Essentially once a .Conflict happens it is permanent,

No, it's not. Conflicts appear due to different letter case. 

If you add a 'healthy' Filename.ext to the folder, and 1) there is no such file on the other side at all, but 2) the conflict still appears, these are the possible causes:

1) there is actually a filename.ext on the other peer

2) not all conflicts were removed from the folder (before putting the healthy file back to the folder)

3) there are still conflicting symlinks. 

 

Can you please send debug logs to us. Please indicate what are your devices and what exactly files/folders are creating Conflicts. 

Share this post


Link to post
Share on other sites

Windows https://www.dropbox.com/s/gyxvuha9ewinkvd/Windows%20Logs.zip?dl=0

 

Mac https://www.dropbox.com/s/08srnugx21cg9pa/Mac%20Logs.zip?dl=0

 

Filename "Animusic.m4v"

 

File was removed from dir on the mac

.Conflict File disappeared on windows

 

No files named "Animusic.m4v" existed on either machine in the directory

"Animusic.m4v" was moved back on the mac, .conflict was created on the windows machine.

No file named "Animusic.m4v" existed on the windows despite BitTourrent Sync creating the conflict file.

 

After this I played around trying to get it to unconflict and couldn't.

Share this post


Link to post
Share on other sites

This still looks like a regular letter case conflict. 

 

On Mac you had ANIMUSIC.m4v in iTunes Media, and this was conflicting with file on Windows.  Quit Sync, completely delete ANIMUSIC.m4v and Animusic.m4v from folders, Trash, Archive on both. 

 

Plus there are some records about Text.xts and conflicting TEXT.txt being renamed to Animusic.Conflict.m4v, which may also lead to conflicts appearing. Is it the Animusic.m4v - the previous conflicting Text.txt file? 

Share this post


Link to post
Share on other sites

I have a somewhat different problem.
I have five machines running on different platforms. Several of them have an archive of the iPhone Camera Backup, but they keep generating .conflict files even when they're completely equal. (I have tested some of them with unix diff.)
This just happens over time, no interaction whatsoever, except the Iphone Bittorrent Sync app being shut down from the low memory conditions of my Iphone 4. (Which also has made some corrupt databases for me.)
It seems kind of stupid. Could perhaps btsync check if .conflict files are identical to the original and not make a .conflict file if they are?

 

And,best way to delete these .conflict files is to shut down all btsync programs I have running and remove the files?
Or would it create a corrupted database again?

Share this post


Link to post
Share on other sites

haraldthi,

 

Please double cases. IMG/img or JPG/jpg can cause conflicts. 

 

Sync actually checks that the new file is the same as local, differing only in letter case. Since local file system cannot allow Filename and filename, conflicts are created. The problem is complicated if there are some Linux peers (where Filename and filename are allowed), and when they both come to a Windows or Mac. 

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.