Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2022

This is an automatic backport of pull request #2314 done by Mergify.
Cherry-pick of ada4af0 has failed:

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

You are currently cherry-picking commit ada4af0.
  (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:
	new file:   docs/release-notes/8.4.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/release-notes.asciidoc

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: nastasha-solomon <79124755+nastasha-solomon@users.noreply.github.com>
Co-authored-by: Joe Peeples <joe.peeples@elastic.co>
Co-authored-by: Janeen Mikell-Straughn <57149392+jmikell821@users.noreply.github.com>
Co-authored-by: nastasha.solomon <nastasha.solomon@elastic.co>
(cherry picked from commit ada4af0)

# Conflicts:
#	docs/release-notes.asciidoc
@nastasha-solomon nastasha-solomon merged commit e15dd0f into 8.4 Aug 23, 2022
@mergify mergify bot deleted the mergify/bp/8.4/pr-2314 branch August 23, 2022 23:54
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.

3 participants