Merge eng/ from main on assets push
#8020
Merged
Conversation
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
…D NOT want to deal with
weshaggard
reviewed
Apr 4, 2024
weshaggard
reviewed
Apr 4, 2024
weshaggard
reviewed
Apr 4, 2024
weshaggard
approved these changes
Apr 4, 2024
Member
Author
|
/azp run tools - test-proxy - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…. definitely don't want that to be the case
This was referenced Apr 10, 2024
Merged
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.
@weshaggard I'm extremely pleased with this little diff methodology. Let me know what you think.
gitdiscovered in integration tests. Why is a soft reset failing?mainfor the patch. The weird error we were seeing on CLI integration for windows, is that a soft reset with uncommitted changes resulted in a weird error state that git couldn't understand how to resolve automatically. (unable to retrieve promisor remote) By placing the soft reset behind the changes actually being committed, we totally sidestep the entire problem.