Surprisingly, it seems the FAQ and in-app help do not explicitly explain this anywhere. Could maybe add a FAQ page detailing what the sync variants do.
What exactly happens when the different sync variant modes find a conflict?
I am most interested in Two-Way mode. I see some "OriginalFilename[Conflict].ext" files being created, but do not understand their purpose.
1. Has "OriginalFilename.ext" been updated in either folder?
2. If not, and if I take no action, will this file in this folder pair never propagate changes in either direction again?
3. What options do I have to resolve the situation? (If even necessary; perhaps the [Conflict] file is just provided as a backup of what version was NOT propagated?)
Thanks for the great program!
What happens in a Two-Way mode conflict?
- Posts: 5
- Joined: 17 Feb 2016
-
- Site Admin
- Posts: 7282
- Joined: 9 Dec 2007
Those file names are not created by FreeFileSync.. I see some "OriginalFilename[Conflict].ext" files being created
In general, the sync direction for conflicts can be set up in synchronization settings, except for "two way" which requires to set a direction manually.
- Posts: 5
- Joined: 17 Feb 2016
Oh humm... I'll have to see from where else in the process that [Conflict] file is coming. Sorry about that.
How can I set a direction manually? Do I have to manually copy one of the versions over the other? Is that the only option, and will all syncing cease until I manually intervene?
For example, I have a log file now with the following:
Warning: The following items have unresolved conflicts and will not be synchronized:
"Folder\File.ext": Both sides have changed since last synchronization.
If File.ext is edited on one side, and not the other, before the next sync, with that freshly edited version then prevail and overwrite the other side?
How can I set a direction manually? Do I have to manually copy one of the versions over the other? Is that the only option, and will all syncing cease until I manually intervene?
For example, I have a log file now with the following:
Warning: The following items have unresolved conflicts and will not be synchronized:
"Folder\File.ext": Both sides have changed since last synchronization.
If File.ext is edited on one side, and not the other, before the next sync, with that freshly edited version then prevail and overwrite the other side?
-
- Site Admin
- Posts: 7282
- Joined: 9 Dec 2007
By setting the direction on the preview dialog (main window).How can I set a direction manually
No, this is still a conflict. Conflicts are handled on a per-file basis, so it doesn't matter if an intermediate sync was successful for all other files.If File.ext is edited on one side, and not the other, before the next sync, with that freshly edited version then prevail and overwrite the other side?
- Posts: 5
- Joined: 17 Feb 2016
This is being done via batch file. Whats suggested best practice in such a situation?
Obviously, there is no preview dialog in normal operation.
Obviously, there is no preview dialog in normal operation.
- Posts: 5
- Joined: 17 Feb 2016
Let me try to be more specific:
What actions will cause FFS to consider the file pair to no longer be in conflict? Is the only option for FFS to find both files to be identical at some point (i.e. requiring some non-FFS agent to copy one version over the other)?
What actions will cause FFS to consider the file pair to no longer be in conflict? Is the only option for FFS to find both files to be identical at some point (i.e. requiring some non-FFS agent to copy one version over the other)?
-
- Site Admin
- Posts: 7282
- Joined: 9 Dec 2007
To resolve a conflict a sync direction needs to be set manually. In the case of ffs_batch jobs there will be a warning dialog if conflicts occur with the option to "switch to main dialog" to resolve them by hand.
- Posts: 5
- Joined: 17 Feb 2016
OK. We will switch to a single master mirroring scheme instead to avoid needing manual intervention. Thanks for the clarification!
