[stable-3.35] fix(auto-upload): handle existing sync conflicts#16292

alperozturk96 merged 2 commits into

stable-3.35nextcloud/android:stable-3.35from

backport/16273/stable-3.35nextcloud/android:backport/16273/stable-3.35Copy head branch name to clipboard