Cloud conflict resolution failing
4.5
The tool to merge or pick between conflicting versions is not working.
Symptoms
- "Conflict" files keep appearing
- Cannot merge changes
- Resolution dialog crashes
Possible Causes
- Complex file structure
- App bug
- Permissions
Step-by-Step Fix
1
Manual Merge
Open both versions and manually copy changes into one file.
2
Rename One Version
Rename the "Conflict" file to something else to stop the loop.
3
Clear Sync Cache
Forces the app to re-evaluate the local and remote files.
When to See a Technician
If conflicts persist, stop the sync app, fix the files locally, then restart the app.
Rate this Fix
0 / 5(0 ratings)
Comments (0)
No comments yet. Be the first to share!