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.

Sign up for GitHub

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

Jump to bottom

Fix sync conflict when user chooses "Keep already existing file" (Quick) #9036

Closed
wants to merge 4 commits into from
Closed

Fix sync conflict when user chooses "Keep already existing file" (Quick) #9036

wants to merge 4 commits into from

Commits on Sep 29, 2021

  1. :Conflict files are removed from the upload storage manager after dow… 

    …nloaded successfully.
    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    b31ee28 View commit details
    Browse the repository at this point in the history

  2. revert Project.xml

    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    ec04ba3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:nextcloud/android

    @wknds
    wknds committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    fe8e31a View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. removed a check in KEEP_SERVER switch clause. 1) The check prevents s… 

    …olving file conflicts (keep server) correctly. 2) The check involves FileUploader.LOCAL_BEHAVIOUR_DELETE, intended use is for media file uploads.
    @wknds
    wknds committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    114af48 View commit details
    Browse the repository at this point in the history