Improve workaround for EOL problems on Windows #3389
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
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.
This PR improves a workaround for problems described in #3277. The problem is that with a weird mix of conditions under which files were created and which git config EOL settings were set, files are left behind dirty in the working tree with no chance of discarding the changes. Not even hard reset works. This just commits them in another way.
This PR doesn't solve #3277 entirely but unblocks the synchronization with a (possibly unsafe) operation so that installer PR unified build legs get working again (dotnet/installer#18917)
Release Note Category
Release Note Description
Fixes a problem with EOLs during VMR synchronization on Windows