Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 19, 2025

Signed-off-by: EsoragotoSpirit wanglichen@starrocks.com

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

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.5
    • 3.4
    • 3.3
    • 3.2
    • 3.1

This is an automatic backport of pull request #59091 done by [Mergify](https://mergify.com).

(cherry picked from commit 241c963)

# Conflicts:
#	docs/ja/administration/management/resource_management/resource_group.md
@mergify mergify bot added the conflicts label May 19, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 19, 2025

Cherry-pick of 241c963 has failed:

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

You are currently cherry-picking commit 241c9632ed.
  (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:   docs/en/administration/management/resource_management/resource_group.md
	modified:   docs/zh/administration/management/resource_management/resource_group.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/ja/administration/management/resource_management/resource_group.md

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

@mergify mergify bot mentioned this pull request May 19, 2025
24 tasks
@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels May 19, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 19, 2025 14:16
@mergify mergify bot closed this May 19, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 19, 2025

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

auto-merge was automatically disabled May 19, 2025 14:16

Pull request was closed

Signed-off-by: 絵空事スピリット <wanglichen@starrocks.com>
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 20, 2025 00:50
auto-merge was automatically disabled May 23, 2025 16:35

Pull request was closed

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 26, 2025 01:04
auto-merge was automatically disabled May 26, 2025 01:04

Pull request was closed

@EsoragotoSpirit EsoragotoSpirit deleted the mergify/bp/branch-3.2/pr-59091 branch May 26, 2025 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge conflicts documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants