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

chore(dependabot): Adding dep to release branches (backport #67) #82

Merged
merged 2 commits into from
Sep 11, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 11, 2023

This is an automatic backport of pull request #67 done by Mergify.
Cherry-pick of 34d8adf has failed:

On branch mergify/bp/release/v2.x.x/pr-67
Your branch is up to date with 'origin/release/v2.x.x'.

You are currently cherry-picking commit 34d8adf.
  (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 <file>..." to mark resolution)
	both modified:   .github/dependabot.yml

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/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

(cherry picked from commit 34d8adf)

# Conflicts:
#	.github/dependabot.yml
@mergify mergify bot added the conflicts label Sep 11, 2023
@davidterpay davidterpay merged commit 5b79dfa into release/v2.x.x Sep 11, 2023
7 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v2.x.x/pr-67 branch September 11, 2023 18:21
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