PR: Handle merging directories containing same-named read-only files#56
Open
apteryks wants to merge 1 commit intospyder-ide:masterfrom
Open
PR: Handle merging directories containing same-named read-only files#56apteryks wants to merge 1 commit intospyder-ide:masterfrom
apteryks wants to merge 1 commit intospyder-ide:masterfrom
Conversation
ccordoba12
changed the title
Member
|
Please update reference screenshots |
CAM-Gerlach
previously approved these changes
Jun 11, 2022
Member
CAM-Gerlach
left a comment
CAM-Gerlach
left a comment
There was a problem hiding this comment.
Seems reasonable, thanks. LGTM.
Funny enough, I just had to deal with a similar problem in another package I maintain, and fell back to writing my own error-tolerant copytree routine, only to later discover there was already one here, heh.
Member
|
For whatever reason, the checks aren't retriggering here even though I re-ran them. @apteryks , could you e.g. |
Fixes spyder-ide#54. * docrepr/utils.py (merge_directories): Also handle 'shutil.Error' exceptions.
Author
|
Done! But feel free to adjust the way you like. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #54.
exceptions.