Show specific error message in toast when plan merge fails to begin#1748
Merged
AaronPlave merged 1 commit intoAug 13, 2025
Merged
Conversation
AaronPlave
temporarily deployed
to
test-workflow
GitHub Actions
Inactive
AaronPlave
temporarily deployed
to
test-workflow
GitHub Actions
Inactive
goetzrrGit
approved these changes
Aug 13, 2025
Contributor
goetzrrGit
left a comment
goetzrrGit
left a comment
There was a problem hiding this comment.
Looks good to me. I was able to see the message
Cannot begin merge. The contents of the two plans are identical.
AaronPlave
force-pushed
the
fix/851/improve-identical-plan-merge-error-message
branch
from
7cb0fc5 to
57b994a
Compare
AaronPlave
temporarily deployed
to
test-workflow
GitHub Actions
Inactive
AaronPlave
force-pushed
the
fix/851/improve-identical-plan-merge-error-message
branch
from
57b994a to
85abf80
Compare
AaronPlave
temporarily deployed
to
test-workflow
GitHub Actions
Inactive
|
AaronPlave
deleted the
fix/851/improve-identical-plan-merge-error-message
branch
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
2 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.
Closes #851 by presenting the specific error message that results from beginning the merge. We don't have a feasible method at the moment for checking plan merge validity (e.g. one plan is deleted, plans are identical, etc) so surfacing the error message is the best we can do for now.
Testing: