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: update v21.x sqs deps to point to sqs/v21.x branch (backport #7326) #7327

Merged
merged 2 commits into from
Jan 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2024

This is an automatic backport of pull request #7326 done by Mergify.
Cherry-pick of 56847c8 has failed:

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

You are currently cherry-picking commit 56847c8c.
  (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:   go.mod
	both modified:   go.sum

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

@mergify mergify bot added the conflicts label Jan 16, 2024
@mergify mergify bot assigned p0mvn Jan 16, 2024
@p0mvn p0mvn changed the title chore: update sqs deps to point to sqs/osmosis-main branch (backport #7326) chore: update v21.x sqs deps to point to sqs/v21.x branch (backport #7326) Jan 16, 2024
@p0mvn p0mvn force-pushed the mergify/bp/v21.x/pr-7326 branch from ec560bb to 9860d67 Compare January 16, 2024 07:59
@p0mvn p0mvn merged commit 0bb5738 into v21.x Jan 16, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v21.x/pr-7326 branch January 16, 2024 21: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