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.6] Document a known issue about detection rules being duplicated upon update (backport #4022) #4081

Merged
merged 2 commits into from
Oct 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

This is an automatic backport of pull request #4022 done by Mergify.
Cherry-pick of 254cc02 has failed:

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

You are currently cherry-picking commit 254cc025.
  (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/release-notes/8.6.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/release-notes/8.7.asciidoc
	deleted by us:   docs/release-notes/8.8.asciidoc
	deleted by us:   docs/release-notes/8.9.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

…date (#4022)

(cherry picked from commit 254cc02)

# Conflicts:
#	docs/release-notes/8.7.asciidoc
#	docs/release-notes/8.8.asciidoc
#	docs/release-notes/8.9.asciidoc
@github-actions
Copy link

Documentation previews:

@nastasha-solomon nastasha-solomon merged commit 5cdea47 into 8.6 Oct 19, 2023
1 check passed
@nastasha-solomon nastasha-solomon deleted the mergify/bp/8.6/pr-4022 branch October 19, 2023 19:57
acorretti pushed a commit that referenced this pull request Nov 19, 2024
…pon update (backport #4022) (#4081)

Co-authored-by: Nastasha Solomon <[email protected]>
Co-authored-by: nastasha.solomon <[email protected]>
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.

1 participant