Code

VFS wipe moved folder when conflict#3425

Code

Merged

allexzander merged 2 commits intomasternextcloud/desktop:masterfrom bugfix/vfs-wipe-moved-folder-when-conflictnextcloud/desktop:bugfix/vfs-wipe-moved-folder-when-conflictCopy head branch name to clipboardJun 15, 2021

+121-4

Commits

Commits on Jun 15, 2021

• Wipe empty folder when moving a VFS placeholder. Keep a folder if there are hydrated items inside.

  Show description for 6312f6d
  allexzander

  committed
  6312f6d

• Add error message to GUI.

  Show description for a3d12a6
  allexzander

  committed
  a3d12a6