I seem to remember that there was a separate bug report that that the mechanism that resolves conflicts sometimes decides to abort the sync. Perhaps you have encountered this problem.
I seem to remember that there was a separate bug report that that the mechanism that resolves conflicts sometimes decides to abort the sync. Perhaps you have encountered this problem.