Update Distro Hash to Fix Merge Conflicts in ADS Pipeline. #26322
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
kburtram
approved these changes
May 28, 2025
Benjin
approved these changes
Jun 6, 2025
laurenastrid1
approved these changes
Jun 6, 2025
kburtram
approved these changes
Jun 6, 2025
laurenastrid1
deleted the
lewissanchez/fix-conflicts-with-merge-distro-step
branch
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.
Pull Request Template – Azure Data Studio
Description
Provide a clear, concise summary of the changes in this PR. What problem does it solve? Why is it needed? Link any related issues using issue closing keywords.
Code Changes Checklist
npm run test)Reviewers: Please read our reviewer guidelines
This PR doesn't change any code, but it updates the commit hash to point to the hash with merge conflict fixes, so that the build pipeline's "Merge Distro" step is back to a passing state.