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

[8.18] 8.18: update docs (backport #15470) #15483

Merged
merged 4 commits into from
Feb 5, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2025

Merge as soon as branch is created and the GitHub checks are green. And the PR in main for the Mergify changes has been merged.


This is an automatic backport of pull request #15470 done by Mergify.

Co-authored-by: obltmachine <[email protected]>
(cherry picked from commit 711b3e6)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 30, 2025
@mergify mergify bot requested a review from a team as a code owner January 30, 2025 16:40
Copy link
Contributor Author

mergify bot commented Jan 30, 2025

Cherry-pick of 711b3e6 has failed:

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

You are currently cherry-picking commit 711b3e6f.
  (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:   CHANGELOG.asciidoc
	new file:   changelogs/8.18.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   changelogs/head.asciidoc

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

Copy link
Contributor Author

mergify bot commented Feb 3, 2025

This pull request has not been merged yet. Could you please review and merge it @? 🙏

changelogs/head.asciidoc Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Feb 5, 2025
changelogs/8.18.asciidoc Outdated Show resolved Hide resolved
@mergify mergify bot merged commit 477bdf2 into 8.18 Feb 5, 2025
10 checks passed
@mergify mergify bot deleted the mergify/bp/8.18/pr-15470 branch February 5, 2025 20:29
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