projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7cddaf8) | patch
Discovery: Adjust the instruction in case of resolved conflict
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 16 Oct 2018 12:44:20 +0000 (14:44 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:09 +0000 (10:58 +0100)
commitedd866b32b651cccf12fb59645d00b4e24a6c938
tree03f0d089ff746cc114c82096c8ca023fa12d21d7tree | snapshot
parent7cddaf82abcc6f579f012835ba5d2e8006cb3bd3commit | diff
Discovery: Adjust the instruction in case of resolved conflict

When resolving a conflict because the file was just updated on the server,
we write all the metadata on the database immediatly, so INSTRUCITON_NONE
is enough and UPDATE_METADATA is not needed
src/libsync/discovery.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.