Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tool] Add the limit on merging feature/enhancement prs on branches (backport #57278) #57383

Merged
merged 2 commits into from
Mar 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

…57278)

(cherry picked from commit 90c5fc3)

# Conflicts:
#	.github/workflows/inspection-be-coverage.yml
#	.github/workflows/pr-checker.yml
@mergify mergify bot added the conflicts label Mar 28, 2025
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 90c5fc3 has failed:

On branch mergify/bp/branch-3.2/pr-57278
Your branch is up to date with 'origin/branch-3.2'.

You are currently cherry-picking commit 90c5fc36dc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/approve-checker.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/inspection-be-coverage.yml
	both modified:   .github/workflows/pr-checker.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 28, 2025 07:41
@mergify mergify bot closed this Mar 28, 2025
auto-merge was automatically disabled March 28, 2025 07:41

Pull request was closed

Copy link
Contributor Author

mergify bot commented Mar 28, 2025

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@andyziye andyziye reopened this Mar 28, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 28, 2025 07:45
@wanpengfei-git wanpengfei-git merged commit eda3b5e into branch-3.2 Mar 28, 2025
24 of 25 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-57278 branch March 28, 2025 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants