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

fix(cli): improve prune command ux (backport #16856) #16875

Merged
merged 4 commits into from
Jul 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2023

This is an automatic backport of pull request #16856 done by Mergify.
Cherry-pick of 317fb0b has failed:

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

You are currently cherry-picking commit 317fb0b33.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/pruning/main.go
	both modified:   simapp/simd/cmd/root.go
	deleted by us:   simapp/simd/cmd/root_v2.go

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 317fb0b)

# Conflicts:
#	CHANGELOG.md
#	client/pruning/main.go
#	simapp/simd/cmd/root.go
#	simapp/simd/cmd/root_v2.go
@mergify mergify bot requested a review from a team as a code owner July 7, 2023 10:24
@mergify mergify bot added the conflicts label Jul 7, 2023
@julienrbrt julienrbrt self-assigned this Jul 7, 2023
@github-actions github-actions bot added the C:CLI label Jul 7, 2023
@julienrbrt julienrbrt removed their assignment Jul 7, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK

@julienrbrt
Copy link
Member

After this PR, as it has been a month, I'll be preparing the release v0.47.4 release and starting testing.

@julienrbrt julienrbrt merged commit 54db420 into release/v0.47.x Jul 7, 2023
28 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16856 branch July 7, 2023 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

1 participant