Skip to content

fix!: Differentiate merge method of pull request and merge queue - #3559

Merged
gmlewis merged 1 commit into
google:masterfrom
stanfordpeng:different-merge-queue-merge-method
Apr 23, 2025
Merged

fix!: Differentiate merge method of pull request and merge queue#3559
gmlewis merged 1 commit into
google:masterfrom
stanfordpeng:different-merge-queue-merge-method

Conversation

@stanfordpeng

@stanfordpengstanfordpeng commented Apr 23, 2025

Copy link
Copy Markdown
Contributor

BREAKING CHANGE: MergeMethod* consts have been split into: PullRequestMergeMethod* and MergeQueueMergeMethod*.

Fixes: #3558

This issue will cause GitHub API return error if user use type MergeMethod in MergeQueueRuleParameters.MergeMethod:

422 Invalid request. Invalid property /rules/0: data matches no possible input. See `documentation_url`. []

@google-cla

Copy link
Copy Markdown

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@gmlewisgmlewis changed the title differentiate merge method of pull request and merge queueDifferentiate merge method of pull request and merge queueApr 23, 2025
@codecov

codecovBot commented Apr 23, 2025

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.24%. Comparing base (6a7684f) to head (357a569).
Report is 5 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #3559 +/- ##
=======================================
Coverage 91.23% 91.24% =======================================
Files 183 183 Lines 16053 16063 +10 =======================================
+ Hits 14646 14656 +10 
Misses 1231 1231 Partials 176 176 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@gmlewisgmlewis added Breaking API Change PR will require a bump to the major version num in next release. Look here to see the change(s). NeedsReview PR is awaiting a review before merging. labels Apr 23, 2025
@gmlewisgmlewis changed the title Differentiate merge method of pull request and merge queuefix!: Differentiate merge method of pull request and merge queueApr 23, 2025

@gmlewisgmlewis left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @stanfordpeng!
LGTM.

Awaiting second LGTM+Approval from any other contributor to this repo before merging.

@stevehipwell - might you be available for a code review? Thank you!

@stevehipwellstevehipwell left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gmlewis

Copy link
Copy Markdown
Collaborator

Thank you, @stevehipwell!
Merging.

@gmlewisgmlewis removed the NeedsReview PR is awaiting a review before merging. label Apr 23, 2025
@gmlewis
gmlewis merged commit 04274a9 into google:masterApr 23, 2025
jlaportebot added a commit to jlaportebot/go-github that referenced this pull request Jun 28, 2026
…gle#3559)
BREAKING CHANGE: `MergeMethod*` consts have been split into: `PullRequestMergeMethod*` and `MergeQueueMergeMethod*`.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Breaking API ChangePR will require a bump to the major version num in next release. Look here to see the change(s).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

type MergeMethod only support lowercase which is conflicted with github API

3 participants

@stanfordpeng@gmlewis@stevehipwell