Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve conflicts dialogue shows wrong information (dates) #5840

Closed
2 tasks
kleajmp opened this issue Jun 23, 2023 · 3 comments
Closed
2 tasks

resolve conflicts dialogue shows wrong information (dates) #5840

kleajmp opened this issue Jun 23, 2023 · 3 comments

Comments

@kleajmp
Copy link

kleajmp commented Jun 23, 2023

Is this a bug or am I wrong?
running desktop client v3.9.0 on openSuse

first of all I am super happy that the resolve all conflicts dialogue implementation is finally released.
it works for me when I check "All server versions" to keep all newest versions of all files.

but here is the bug:

  • when I really check the dates next to the individual files the server version column shows the older date (actually the exact date of the local version) so these two columns are faulty reversed (!)
  • when I select "keep local version" the newest file is overwritten by the older local copy
  • when select "keep server version" a new set of dialogs appear to confirm if I want to delete the older conflicted copy, a button "yes to all" would be a great addition.

so the thinks to do in my advice:

  • check the date info which are in my case (both on windows as opensuse client) shown in the wrong (opposite) column
  • add a "yes to all" button in the "confirm deletion dialogue" after choosing to keep al the newest versions (server version)

here some images to illustrate the bug and the suggested button addition:
Screenshot_20230622_194304
Screenshot_20230622_194556
Screenshot_20230622_195223
Screenshot_20230622_195512

Originally posted by @kleajmp in #5635 (comment)

@mgallien
Copy link
Collaborator

mgallien commented Jul 4, 2023

@kleajmp thanks for your report
I will have a look and post my feedback here

@konradbr
Copy link

Hello,

I confirm this is a #bug and that I am experiencing the same issue. Please see attached screenshot:

Screenshot 2023-07-16 133409 - Copy

This should be tagged #bug and #urgent as it can lead to loss on edited files on clients unless one has figured out what's happening!

Best,

Konrad

@mgallien
Copy link
Collaborator

fixed by #6043

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants