Check a parent branch merge commit exists or not #353
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
Current Aviator status
This PR was merged using Aviator.
See the real-time status of this PR on the
Aviator webapp.
Use the Aviator Chrome Extension
to see the status of your PR within GitHub.
|
FlexReview SummaryBased on the code complexity and the author's expertise score, these are the suggested reviewers:
See the list of alternate reviewers in the detailed breakdown below. Detailed BreakdownAuthor’s expertise score for the modified files:
† Indicates that the file doesn't need an expert review. (?) See full breakdown of the reviewers on the Aviator webapp. |
Konboi
force-pushed
the
issue-305
branch
2 times, most recently
from
e5e754b to
79f29ea
Compare
draftcode
reviewed
Jun 26, 2024
internal/actions/pr.go
Outdated
| @@ -265,6 +265,11 @@ func CreatePullRequest( | |||
| return nil, errors.Errorf("no commits between %q and %q", prCompareRef, opts.BranchName) | |||
| } | |||
|
|
|||
| // Check if a parent branch has already been merged or not | |||
| if parentMeta.MergeCommit != "" { | |||
| return nil, errors.Errorf("failed to create a pull request. The parent branch %q has already been merged", parentMeta.Name) | |||
There was a problem hiding this comment.
Can you mention that "Please run av stack sync to rebase the branch first."
to detect reason and explain it
draftcode
approved these changes
Jun 27, 2024
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.
to detect reason and explain it for #305
(Does this change work as you intended?)