Code

Conflict fixes#3972

Code

Merged

juliusknorr merged 7 commits intomainnextcloud/text:mainfrom bugfix/noid/conflictnextcloud/text:bugfix/noid/conflictCopy head branch name to clipboardMar 24, 2023

+157-64

Commits

Commits on Mar 24, 2023

• test: Add cypress tests for resolving conflicts

  Show description for c3c1891
  juliusknorr

  committed
  c3c1891

• fix: store actually used mtime

  Show description for bd1e49f
  juliusknorr

  committed
  bd1e49f

• fix: Properly restart sync after conflict resolution

  Show description for adfbaf4
  juliusknorr

  committed
  adfbaf4

• fix: Avoid writing file content if it has not changed

  Show description for 19e3e30
  juliusknorr

  committed
  19e3e30

• fix: Fix styling of collission dialog and move it out of the editor

  Show description for 5a2541d
  juliusknorr

  committed
  5a2541d

• fix: Do not disconnect during conflict to be able to catch up on a resolution

  Show description for eeca470
  juliusknorr

  committed
  eeca470

• Compile assets

  Show description for ed977b5
  nextcloud-command

  committed
  ed977b5