projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75a97bd) | patch
Ensure a sync happens after a conflict resolution
authorKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 08:50:26 +0000 (09:50 +0100)
committerCamila (Rebase PR Action) <hello@camila.codes>
Tue, 15 Dec 2020 09:40:57 +0000 (09:40 +0000)
commit8c4bd2bb5286bbafbba1c5c45ae0b625257d5f88
treeb183dad3d088fb052790e09cb061da286ab11111tree | snapshot
parent75a97bdaf312b09cff2f96a5e42d772091b73e49commit | diff
Ensure a sync happens after a conflict resolution

You'd expect that after a conflict resolution the file watcher would
pick up the change and trigger a sync. For some reason it doesn't seem
to happen on at least some Ubuntu systems. In such cases the user would
then still have a stale conflict entry in the activity list and wouldn't
be able to do anything with it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/socketapi.cpp diff | blob | history
src/gui/tray/ActivityListModel.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.