Skip to content

Allow state exporting from any directory (backport #3608)#3613

Merged
ValarDragon merged 2 commits intov12.xfrom
mergify/bp/v12.x/pr-3608
Dec 6, 2022
Merged

Allow state exporting from any directory (backport #3608)#3613
ValarDragon merged 2 commits intov12.xfrom
mergify/bp/v12.x/pr-3608

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Dec 4, 2022

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

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

You are currently cherry-picking commit da4f5038.
  (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:   cmd/osmosisd/cmd/root.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/export.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

* Allow exporting from any directory

* Changelog

(cherry picked from commit da4f503)

# Conflicts:
#	CHANGELOG.md
#	app/export.go
@mergify mergify bot requested a review from a team December 4, 2022 20:06
@mergify mergify bot added the conflicts label Dec 4, 2022
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:docs Improvements or additions to documentation labels Dec 4, 2022
@ValarDragon ValarDragon merged commit a3b31c5 into v12.x Dec 6, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v12.x/pr-3608 branch December 6, 2022 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A:automerge C:app-wiring Changes to the app folder C:docs Improvements or additions to documentation conflicts

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

1 participant