export skipped when file conflict is skipped #1270
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
grnd-alt
force-pushed
the
enh/export-skip-on-conflict-resolution
branch
2 times, most recently
from
6cf5496 to
c6e8e7e
Compare
Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
AndyScherzinger
force-pushed
the
enh/export-skip-on-conflict-resolution
branch
from
c6e8e7e to
9d31963
Compare
|
See my comment in the server PR: I do not think we need this as I think we should just skip every file where neither rename nor "new" is selected. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
required by: nextcloud/server#46354
this PR will export an additional value
skippedto indicate if the file conflict has been skipped rather than resolved. Before there seemed to be no way of telling the difference between skipping and selecting only the original file.Both cases would return selected = [] and renamed = [] causing an issue in server when that skipping files would the delete the file that was moved.