[stable-3.35] fix(auto-upload): sync conflict handling#16343

alperozturk96 merged 8 commits into

stable-3.35nextcloud/android:stable-3.35from

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