What is 'branching' and how to resolve branching conflicts
When one file is edited and changed simultaneously in multiple locations, there is a potential for data loss since there are two different versions of the file with the same name. To ensure no data is lost, unlike most systems, Syncplicity detects when conflicts occur and preserve the contents of each unique file version by renaming the files through a process called branching.
- Cause of Branching
- When two or more users simultaneously open and edit the same file creating two different versions with the same name
- When a file is open or in use by a program on more than one computer
- When first syncing two computers that have folders with the same file names, but different file content.
- When a file matches any of the above qualifications, Syncplicity will branch the file into additional files, which preserves the changes and additions made by each user. This is noted on the file name with (conflicting version <#> created on <computername>). A Syncplicity user can review the conflicting files, determine the most accurate and up-to-date version, and delete the versions that are outdated.
- Preventing Branching
For multi-user accounts, check with your colleagues to make sure other users aren't editing the document at similar times.
- Resolving Branches
- On the computer, open the folder that contains the branched files
- Additional files will now exist in this folder:
a. The original, unbranched document
b. Version 1, renamed to include the name of the computer on which the document was created/edited
c. Version 2, renamed to include the name of the computer on which the document was created/edited
d. Any additional versions that have been created by additional users or edits
3. Review each of the documents to see which is the most current, or authoritative, version of this document
4. Rename the version to be kept with the original file name (alternatively, copy data from the branched versions into the original file)
5. Delete any versions of this document that are outdated.
Alternatively, you can move the most up-to-date and complete version of the file to an unsynced location, make sure it has the original name, and delete the other versions from the syncpoint (folder). Finally, place the file back in its original place on your device.
Please sign in to leave a comment.