Merge Conflicts Appear After Offline Editing: OneDrive for Business Fix
You edit a file offline, reconnect to the internet, and then see multiple copies of the same file with names like Document (Version 1).docx. This is a merge conflict caused by OneDrive’s sync engine detecting changes made on two separate copies of the same file. The conflict arises because OneDrive cannot automatically merge edits made … Read more