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

show conflict files in subfolder #1107

Closed
jeffli678 opened this issue Feb 22, 2019 · 10 comments
Closed

show conflict files in subfolder #1107

jeffli678 opened this issue Feb 22, 2019 · 10 comments

Comments

@jeffli678
Copy link

Currently, the yellow conflict icon only tells me the top level folder has a conflict. But I have some difficulties finding which files are causing the conflict. I get too many "file xxx is ignored" information in the activity tab, so I cannot find which files are conflicting.

To resolve the issue, I would suggest using the yellow conflict icon on second level folders, third level folders, until the last level of folder. For example, if the files on the Desktop has conflicts, show a conflict icon on those folder(s) contain the files causing a conflict.

@camilasan
Copy link
Member

camilasan commented Feb 27, 2019

Hi @jeffli678! Thanks for the feedback. Could you provide some screenshots with the issue?

cc @jancborchardt

@jancborchardt
Copy link
Member

Yes, screenshots would be helpful here @jeffli678 :)

As far as I understand, there’s e.g. a conflict in Documents 🢒 Important 🢒 Testing 🢒 Document.odt, and only the "Documents" folder shows the sync conflict overlay icon? But yeah, it should be shown on all the parent folders of the containing folder, that is it should bubble up so you can find your way to it.

About the mass of "file is ignored" notifications, we have a separate discussion to solve that at #889 (comment)

@jeffli678
Copy link
Author

Hi, I will try to make a screenshot. But I am actually suggesting a new future -- so I cannot possibly come up with a screenshot for that. What I can do is to show what it currently looks like, and then try my best to explain why the current appearance is not good and how it can be improved.

@camilasan
Copy link
Member

I get too many "file xxx is ignored" information in the activity tab, so I cannot find which files are conflicting.

We actually meant screenshots of the current state ;-)

@jeffli678
Copy link
Author

My apology for the late reply. I am impressed that you are still chasing after this issue. Thanks for your insistence!

It is actually not complex: the activity tab has too many messages and it is not easy to find which files are conflicting.

Screenshot from 2019-08-13 23-34-42

In the initial issue I opened, I cited the "xxx file is ignored" messages. In the screenshot, however, you will see plenty of "You created file xxx" messages. It is noteworthy that in this particular screenshot, the number of messages is acceptable. However, it is also common that my .git folder is ignored (due to its hidden property) and a lot of messages fill this tab and navigating through it is difficult.

I hope I explained everything clearly.

Before I switched to nextcloud, I was using a similar product called Seafile. I remember it handles such conflicts elegantly. However, I cannot remember the exact way.

Here is the way I handle conflicting files now: I directly open the SQLite database generated by nextcloud and browser the relevant table which records the pairs of conflicting files. It is a hack, ^_^.

@jancborchardt
Copy link
Member

Right, so 2 things:

  1. Conflict notifications should be above other notifications like ignored files in the Activity view. They require action and could otherwise lead to data loss or duplication. @camilasan ok? :)

  2. As said above:

About the mass of "file is ignored" notifications, we have a separate discussion to solve that at #889 (comment)

@wolfspyre
Copy link

wolfspyre commented Aug 14, 2019 via email

@jancborchardt
Copy link
Member

Perhaps the activity panel should have the option to filter elements by classifications of activity
Or perhaps it might make sense to have a conflicts and errors tab?

We did use to have it like this and it made the interface more complex and more confusing to figure out where to look.

This is why we changed to the single stream. The only issue is that we are not fully done on that – we need to polish and adjust for all the cases.

As written in Activity tray and activity list design improvements #889

  • We are not going to split the activity view again. We are just not done with it yet.
  • 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)

@stale
Copy link

stale bot commented Sep 19, 2019

This request did not receive an update in the last 4 weeks. Please take a look again and update the issue with new details, otherwise the issue will be automatically closed in 2 weeks. Thank you!

@stale stale bot added the stale label Sep 19, 2019
@jancborchardt
Copy link
Member

Closing in favor of Activity tray and activity list design improvements #889

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

No branches or pull requests

4 participants