Resolve "Conflicted Copies" directly in client apps

nextcloud / server

☁️ Nextcloud server, a safe home for all your data

https://nextcloud.com

GNU Affero General Public License v3.0

27.12k stars 4.03k forks source link

Resolve "Conflicted Copies" directly in client apps #23525

Open sunjam opened 3 years ago

sunjam commented 3 years ago

[x] Android @tobiasKaminsky
[x] Desktop @er-vin
[ ] iOS @marinofaggiana
[x] Server

Please, add the ability for users to resolve Conflicted Copies directly from their Desktop and Mobile apps on all platforms. Right now users receive notifications, but have no clear way to resolve these sync conflicts. Thank you for considering.

conflict

Nextcloud: Sync was successful, unresolved conflicts

Conflict: Server version download, local copy renamed and not uploaded

kesselb commented 3 years ago

The android app already has a dialog to resolve conflicts. For desktop there is also a issue and it's been worked an.

cc @tobiasKaminsky @er-vin do we need a meta issue here to bring this feature to the clients?

sunjam commented 3 years ago

Here is the issue for resolving local conflicts on iOS

The android app already has a dialog to resolve conflicts.

Awesome to hear it is possible to resolve conflicts on Android. :+1:

For desktop there is also a issue and it's been worked an.

Afaik there is no way to resolve these conflicts within Linux or Windows Desktop apps, but I would love to be corrected.

kesselb commented 3 years ago

there is no way to resolve these conflicts within Linux or Windows Desktop apps

That's the current state yes. But as I wrote above team desktop works on it. And with the hint at your other issue you will find the related pull request in no time ;)

sunjam commented 3 years ago

That is amazing to hear, really appreciate it.

On Sat, Oct 17, 2020, 7:37 AM kesselb notifications@github.com wrote:

there is no way to resolve these conflicts within Linux or Windows Desktop apps

That's the current state yes. But as I wrote above team desktop works on it. And with the hint at your other issue you will find the related pull request in no time ;)

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/nextcloud/server/issues/23525#issuecomment-711021875, or unsubscribe https://github.com/notifications/unsubscribe-auth/AANUKZTVMPVJSBSJTM2S3JLSLGT4HANCNFSM4STUS72Q .

tobiasKaminsky commented 3 years ago

I am a bit unsure what this issue is about

Android handles conflict during upload: it does not allow you to upload a conflicting file, but you first have to resolve it
Desktop, as it is mostly working in background, is doing it the other way around: it creates a conflicting file, which then needs to be resolved manually

Now, is this issue about

handling conflicting uploads in Android? Which is working
handling conflicting uploads in Desktop, which seems to miss a smooth conflict handling dialog right now (but it is worked on https://github.com/nextcloud/desktop/pull/2527)
handling conflicted files created by Desktop on mobile

inthreedee commented 3 years ago

@tobiasKaminsky It would seem that the only client that does not handle conflict resolution is iOS: https://github.com/nextcloud/ios/issues/903 https://github.com/nextcloud/ios/issues/1200

Unless this issue is requesting that the server handle these things so the clients don't have to, it would seem the relevant issues already exist for the iOS client.