core/merge: Prevent overwriting dir moves content loss
core/merge: Prevent overwriting dir moves content loss

  If the overwriting folder has a deep hierarchy, there's a good chance
  we'll end up merging the movement of its children before we merge the
  movement of the folder itself.
  In this situation, the Sync would apply the movement of the children
  first as well and when we'll apply the overwriting movement of the
  folder, we'll lose its previously moved content.
  To avoid this, we'll update the moved children again to mark them as
  child movements and remove any `overwrite` markers since the
  overwrite will happen with their parent.

cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop