Skip to content

refactor: reword upgrading.md and verify match with repo (backport #17262)#17312

Merged
julienrbrt merged 2 commits into
release/v0.50.xfrom
mergify/bp/release/v0.50.x/pr-17262
Aug 7, 2023
Merged

refactor: reword upgrading.md and verify match with repo (backport #17262)#17312
julienrbrt merged 2 commits into
release/v0.50.xfrom
mergify/bp/release/v0.50.x/pr-17262

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 7, 2023

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

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

You are currently cherry-picking commit bdb7387fa.
  (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:   docs/architecture/adr-038-state-listening.md
	modified:   simapp/app_config.go
	modified:   simapp/app_v2.go
	modified:   x/consensus/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   UPGRADING.md
	both modified:   x/genutil/client/cli/commands.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 bdb7387)

# Conflicts:
#	CHANGELOG.md
#	UPGRADING.md
#	x/genutil/client/cli/commands.go
@mergify mergify Bot requested a review from a team August 7, 2023 15:57
@mergify mergify Bot added the conflicts label Aug 7, 2023
@ghost ghost requested review from a team, alexanderbez and testinginprod and removed request for a team August 7, 2023 15:57
@julienrbrt julienrbrt self-assigned this Aug 7, 2023
@github-actions github-actions Bot removed C:CLI C:x/genutil genutil module issues labels Aug 7, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) August 7, 2023 16:18
@julienrbrt julienrbrt removed their assignment Aug 7, 2023
@julienrbrt julienrbrt merged commit d9247a9 into release/v0.50.x Aug 7, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17262 branch August 7, 2023 16:27
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants