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

feat(x/ecocredit)!: specify basket denom conventions (backport #770) #773

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2022

This is an automatic backport of pull request #770 done by Mergify.
Cherry-pick of 6303e67 has failed:

On branch mergify/bp/release/v2.2.x/pr-770
Your branch is up to date with 'origin/release/v2.2.x'.

You are currently cherry-picking commit 6303e67.
  (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:   proto/regen/ecocredit/basket/v1/tx.proto
	modified:   x/ecocredit/basket/tx.pb.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   api/regen/ecocredit/basket/v1/state.pulsar.go
	deleted by us:   api/regen/ecocredit/basket/v1/tx.pulsar.go
	deleted by us:   proto/regen/ecocredit/basket/v1/state.proto
	both modified:   x/ecocredit/basket/state.pb.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

* feat(x/ecocredit)!: specify basket denom conventions

* docs

* rename credit_type_name -> credit_type_abbrev

* chore: proto-gen

* Update proto/regen/ecocredit/basket/v1/tx.proto

Co-authored-by: Cory <cjlevinson@gmail.com>

Co-authored-by: technicallyty <48813565+tytech3@users.noreply.github.com>
Co-authored-by: Cory <cjlevinson@gmail.com>
(cherry picked from commit 6303e67)

# Conflicts:
#	api/regen/ecocredit/basket/v1/state.pulsar.go
#	api/regen/ecocredit/basket/v1/tx.pulsar.go
#	proto/regen/ecocredit/basket/v1/state.proto
#	x/ecocredit/basket/state.pb.go
@mergify mergify bot added the conflicts Pull requests that have conflicts with the base branch label Feb 14, 2022
@clevinson
Copy link
Member

Closing in favor of #772

@clevinson clevinson closed this Feb 14, 2022
@clevinson clevinson deleted the mergify/bp/release/v2.2.x/pr-770 branch February 14, 2022 22:20
@robert-zaremba
Copy link
Collaborator

unfortunately we can't automatically backport these PRs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Pull requests that have conflicts with the base branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants