Differences
This shows you the differences between two versions of the page.
| Next revision | Previous revision | ||
| cloudappliance/conflictfiles [2019_11_29 16:26] – created jim | cloudappliance:conflictfiles [2024_02_20 23:55] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 3: | Line 3: | ||
| Conflict files can occur in the following situations: | Conflict files can occur in the following situations: | ||
| - | • A file is locked by one user and edited by another user simultaneously. The owner of the files is working on the version that will be updated and the other user is working on a version that will become conflicted. | + | • A file is locked by one user and edited by another user simultaneously. The owner of the files is working on the version that will be updated and the other user is working on a version that will become conflicted. |
| - | • A file is edited offline while someone else edits the same file online and the two versions are out of sync ie. the timestamp shows the uploaded version is earlier than the newer version | + | • A file is edited offline while someone else edits the same file online and the two versions are out of sync ie. the timestamp shows the uploaded version is earlier than the newer version |
| - | • There is some issue with a rename that causes | + | • There is some issue with a rename that causes a rename unable to not fully take place. If this occurs then a conflict file may also be created |
| ## Conflict files and versioning | ## Conflict files and versioning | ||