[stable28] fix: merge conflict dialog added when overwriting files on move-file action #43811
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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
backportbot
bot
added
enhancement
3. to review
|
/compile |
skjnldsv
approved these changes
Feb 24, 2024
emoral435
approved these changes
Feb 24, 2024
emoral435
force-pushed
the
backport/43667/stable28
branch
from
1952a28
to
cd9e08b
Compare
emoral435
force-pushed
the
backport/43667/stable28
branch
from
cd9e08b
to
53d5e5a
Compare
…action Signed-off-by: Eduardo Morales <emoral435@gmail.com>
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
emoral435
force-pushed
the
backport/43667/stable28
branch
from
53d5e5a
to
ed0ad08
Compare
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.
Backport of #43667
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.