-
Type: Task
-
Status: Resolved
-
Priority: Major
-
Resolution: Fixed
-
Affects Version/s: 1.3.1107
-
Fix Version/s: 1.3.1216
-
Component/s: Synchronizer
-
Sprint:Sprint Drive 7.1-2, Sprint Drive 7.1-3
-
Story Points:3
By making "win" the last modifier.
Note that in some cases some information can be lost, ie. if the file has really been modified on both sides by the same user.
Such self conflicts often happen with Drive Edit and this fix will solve the following issues:
NXDRIVE-144NXDRIVE-115NXDRIVE-145in the case where the doc has been modified on the server by the user having locally edited the file offline
- depends on
-
NXP-16213 Add 'lastContributor' dublincore metadata in FileSystemItem
- Resolved
- is required by
-
NXDRIVE-144 Drive edit: updating a file and saving it quickly creates a conflict
- Resolved
-
NXDRIVE-145 Locally editing a file while Drive is not running will create a conflict when launching Drive
- Resolved
-
NXDRIVE-115 Drive edit makes a conflict when I try to edit .xls and .ppt files
- Resolved
-
NXDRIVE-122 Editing a document locally and on the server at the same time creates a conflict not well handled by Drive
- Resolved
-
NXDRIVE-187 Drive Edit of a document by a user different from the last contributor generates a conflict
- Resolved