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

Conflicted files visibility #1332

Closed
Aesculapius opened this issue Jul 8, 2019 · 3 comments
Closed

Conflicted files visibility #1332

Aesculapius opened this issue Jul 8, 2019 · 3 comments

Comments

@Aesculapius
Copy link

Expected behaviour

When a confllict exists for the desktop client, it gives a warning in the client (yellow exclamation mark). Clicking on that specific line then takes you to the activity tab, where one would expect to see what the exact conflict is and how to best resolve it.

Actual behaviour

When getting to the activity tab, one sees a gigantic list of warnings about hidden files and files on the ignore lists. You have to scroll down endlessly and hope to not have a refresh of the list to be able to find the conflicting line.

Then even if you've found that line, there's too little information to solve the issue. You're not seeing the complete filename (missing the extention) and double clicking on it brings you to the folder in question but with a lot of files in there, still difficult to resolve.

Even then it is unsure how to best resolve the conflict. Most of the time I end up renaming local files and merging stuff together manually.

Steps to reproduce

  1. Generate a conflict by editint a file at the same time on multiple machines...
  2. Watch the GUI of desktop client and activity tab

Client configuration

Client version: 2.5.2git (build 20190319)

Operating system: Windows 10

OS language: English

Installation path of client: "C:\Program Files (x86)\Nextcloud\nextcloud.exe"

Server configuration

Nextcloud version: 16.0.1

Storage backend (external storage): local

Screenshot:

nextcloud-client-1

nextcloud-client-2

@vvombat
Copy link

vvombat commented Aug 2, 2019

I was going to open a new issue for my feature request: But I think this would get merged with this one anyways:

In addition to maybe hightlight the conflicting files or jumping to the regarding line(s) in the activity tab, having a checkbox of sorts "Show ignored files." on top would make the activity tab much more readable. If I added a file to the ignore list, I want to ignore and therefore not see it anymore.

If you want me to open a new issue for my feature request please let me know - I will do so. Sorry if I hijacked this issue in that case.

@wolfspyre
Copy link

wolfspyre commented Aug 5, 2019 via email

@jancborchardt
Copy link
Member

This is a duplicate of Activity tray and activity list design improvements #889, and as written there:

  • Warnings for symlinks should be grouped into only one row. Symbolic links are not supported in syncing: keeporsweep.py, nextcloud-update.sh, and 3 others. Alternatively, symlinks on macOS and Linux should just be synced. symlinks not supported #605
  • Warnings for ignored files should not even be there? Because they are ignored, they should be ignored everywhere. (At most, again just one row: Files not synced because of ignore list rules: ._DS_Store, .gitblasomething, and 200 more)

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

4 participants