-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
fix: merge conflict dialog added when overwriting files on move-file action #43667
Merged
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
emoral435
added
enhancement
3. to review
Waiting for reviews
feature: files
feature: filepicker
labels
Feb 20, 2024
emoral435
force-pushed
the
fix/43489/merge-conflict-dialog
branch
3 times, most recently
from
February 20, 2024 17:33
2077ddd
to
65e080c
Compare
Pytal
reviewed
Feb 21, 2024
Hm. Good observation, and I can replicate it. I will investigate this issue! |
emoral435
force-pushed
the
fix/43489/merge-conflict-dialog
branch
from
February 21, 2024 14:28
65e080c
to
429279d
Compare
skjnldsv
approved these changes
Feb 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Logic makes sense!
susnux
approved these changes
Feb 23, 2024
…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
fix/43489/merge-conflict-dialog
branch
from
February 24, 2024 02:15
429279d
to
b933b67
Compare
Possible performance regression detected Show Output
|
/backport to stable28 |
Merged
2 tasks
Merged
4 tasks
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.
Summary
Resolution
Screenshots / GIF
Checklist