fix(check-merge-safety): expand error type handling #704
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
sayali10
approved these changes
Feb 17, 2025
|
🎉 This PR is included in version 1.74.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
📝 Description
While we've seen the error status come back as
406for the "diff too large" case, we are now seeing some failures with the right error, but a status of"not_available", so it just jumps right to the final error state. This code now falls back to checking the actual error message fordiff is taking too long to generate, if there's no status code to rely on.it seems the way the code was previously was swallowing valid errors, falling back to returning
[]for changed files, leading the validation to return that there were no conflicts, when there actually might have been.🔗 Related Issues