projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d233e5f) | patch
Placeholders: Deal with conflicts when a placeholder exists
authorChristian Kamm <mail@ckamm.de>
Wed, 17 Jan 2018 09:48:25 +0000 (10:48 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:57:48 +0000 (10:57 +0100)
commit0cd83a2c098fdfab45abe716574773ff916912b0
treee564399ee24bc37c62cd312827b0d89e89c879c6tree | snapshot
parentd233e5f8d7074d2e2c343db191582b955a03d6d8commit | diff
Placeholders: Deal with conflicts when a placeholder exists

So "foo.owncloud" exists but the user adds a new "foo".
src/csync/csync_reconcile.cpp diff | blob | history
src/csync/csync_update.cpp diff | blob | history
test/testsyncplaceholders.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.