Makes order of directory resolving deterministic across different OS#2099
Merged
jensens merged 3 commits intocookiecutter:mainfrom Nov 8, 2025
Merged
Conversation
kurtmckee
approved these changes
Sep 17, 2024
Author
|
Thanks for the approval @kurtmckee :) |
Member
|
I'm not an approved reviewer, which GitHub indicates by the gray checkbox: On some other projects I contribute to, I get that sweet, sweet green checkbox: Anybody can review any PRs anywhere, so I do. 👍 |
Author
|
Oh my bad, I didn't see the grey check. That's what I get for doing multiple things at once 😅 |
jensens
approved these changes
Nov 8, 2025
armandmasseaugit
pushed a commit
to armandmasseaugit/cookiecutter
that referenced
this pull request
Nov 19, 2025
…ookiecutter#2099) Co-authored-by: Jens W. Klein <jk@kleinundpartner.at>
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.
The order of items in the
dirnamesandfilenameslists ofos.walkappears to differ depending on which operating system is being used.This PR aims at accounting for this behaviour so that cookiecutter's conflicts handling logic stays consistent across different operating systems.