Comment 0 for bug 603626

Revision history for this message
John Lea (johnlea) wrote : Sync Polish - 2.3.A - All conflicting files need to be synchronised

All conflicting files need to be synchronised.

Currently when a conflict occurs the computer which initiated the sync stores both the original file and the conflicting file. The conflicting file has ".u1conflict" appended to the end of it's file name. However the .u1conflict file is not synced to the second computer where the conflicting file originated from.

Solution: sync the ".u1conflict" files so that the conflict can be resolved from any computer.