chylex
/
Nextcloud-Desktop
mirror of https://github.com/chylex/Nextcloud-Desktop.git
1
0
Fork 0
Code
16,676 Commits 4 Branches 173 Tags 91 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Kevin Ottens 67e81fcd0f
Add KeepBothVersions as a possible solution to ConflictSolver 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-10-22 16:40:46 +02:00
Kevin Ottens 4fdb203cdb
Move some of the SocketApi conflict handling in a ConflictSolver class 
The socket api move and delete commands are not strictly about conflicts
since they also deal with files which couldn't be uploaded for some
other reason. Still the new ConflictSolver could be used in those cases.

This opens the door at reusing that logic in other places.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-10-22 16:40:46 +02:00