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

[Doc]Fix wrong pr url in release notes. (backport #54774) #54784

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 7, 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

(cherry picked from commit 67cdf03)

# Conflicts:
#	docs/en/release_notes/release-3.2.md
#	docs/zh/release_notes/release-3.2.md
Copy link
Contributor Author

mergify bot commented Jan 7, 2025

Cherry-pick of 67cdf03 has failed:

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

You are currently cherry-picking commit 67cdf03c4c.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/release_notes/release-3.2.md
	deleted by us:   docs/zh/release_notes/release-3.2.md

no changes added to commit (use "git add" and/or "git commit -a")

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 added the conflicts label Jan 7, 2025
@mergify mergify bot mentioned this pull request Jan 7, 2025
24 tasks
@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Jan 7, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 7, 2025 09:32
@mergify mergify bot closed this Jan 7, 2025
auto-merge was automatically disabled January 7, 2025 09:32

Pull request was closed

Copy link
Contributor Author

mergify bot commented Jan 7, 2025

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

@EsoragotoSpirit EsoragotoSpirit deleted the mergify/bp/branch-3.2/pr-54774 branch January 7, 2025 09:40
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.

1 participant