NMC-563 File conflict pre dialog #28806
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
|
Please base your changes on nextcloud/server master as your branch seems to include other unrelated commits from s3 changes :) |
|
Besides that, screenshots would be nice to speed up the review process from our design team. |
|
TSI-sangramdesai
force-pushed
the
NMC-563-file-conflict-pre-dialog
branch
3 times, most recently
from
fcedfd2 to
dc8dfe8
Compare
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
TSI-sangramdesai
force-pushed
the
NMC-563-file-conflict-pre-dialog
branch
from
dc8dfe8 to
ff44f95
Compare
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
kesselb
changed the title
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Pre Conflict dialog will appear if conflict occur
Single file conflict:-
Multiple file conflict:-
More details button click - Open Nextcloud default dialog