Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2024

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

On branch mergify/bp/release/v0.50.x/pr-19216
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit bff1d823f.
  (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:   client/v2/CHANGELOG.md
	modified:   client/v2/autocli/app.go
	modified:   simapp/simd/cmd/root_v2.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/autocli/builder.go
	both modified:   client/v2/autocli/msg.go
	both modified:   simapp/simd/cmd/root.go

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 bff1d82)

# Conflicts:
#	client/v2/autocli/builder.go
#	client/v2/autocli/msg.go
#	simapp/simd/cmd/root.go
@mergify mergify bot requested a review from a team January 24, 2024 10:54
@mergify mergify bot added the conflicts label Jan 24, 2024
@julienrbrt julienrbrt self-assigned this Jan 24, 2024
@julienrbrt julienrbrt enabled auto-merge (squash) January 24, 2024 11:12
@julienrbrt julienrbrt merged commit bdbd2b0 into release/v0.50.x Jan 24, 2024
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-19216 branch January 24, 2024 11:28
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants