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, Syncplicity detects when conflicts occur and will preserve the contents of each unique file version by renaming the files through a process called branching.
Causes of Branching
- When two or more users simultaneously open and edit the same file creating two different versions with the same name. Opening a file by itself is generally not sufficient to cause a branch as the file isn't being modified simultaneously across two different locations. Some programs may modify files immediately upon opening. If a file is opened simultaneously in two locations by one of these programs, then that file is being modified in two different locations at the same time.
- 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, each preserving the changes and additions made by each user. This is noted on the branched files name with information in the file name. 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
Branching can be prevented by avoiding editing the same file at the same time across multiple locations.
Branching Defaults
Syncplicity does not branch the following files, as these files can branch automatically on different computers due to differences in data handling.
