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(deps): Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (backport #3105) #3116

Merged
merged 1 commit into from
Oct 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2022

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

On branch mergify/bp/v12.x/pr-3105
Your branch is up to date with 'origin/v12.x'.

You are currently cherry-picking commit 65489023.
  (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:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

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

@mergify mergify bot requested a review from a team October 24, 2022 05:25
@mergify mergify bot added the conflicts label Oct 24, 2022
@p0mvn p0mvn force-pushed the mergify/bp/v12.x/pr-3105 branch from 05a4eb0 to 8339fde Compare October 24, 2022 05:56
@p0mvn p0mvn force-pushed the mergify/bp/v12.x/pr-3105 branch from 8339fde to 2c9650a Compare October 24, 2022 06:02
@p0mvn p0mvn force-pushed the mergify/bp/v12.x/pr-3105 branch from 2c9650a to f95ea50 Compare October 24, 2022 06:18
@p0mvn p0mvn force-pushed the mergify/bp/v12.x/pr-3105 branch from f95ea50 to 6c98fc5 Compare October 24, 2022 23:57
@p0mvn p0mvn merged commit 7ac47d7 into v12.x Oct 25, 2022
@p0mvn p0mvn deleted the mergify/bp/v12.x/pr-3105 branch October 25, 2022 00:16
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