-
Notifications
You must be signed in to change notification settings - Fork 608
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
chore: x/mint docs and clean up, excluding mint keeper (backport #1857) #2072
Conversation
1e7917e
to
6feea69
Compare
This generated a lot of unrelated Seems that |
Is the reason for forcepushing due to resetting the branch to see the merge conflict? Its pretty to hard to distinguish / double check backport changes vs everything else needed to get it mergeable with the forcepush |
go.mod
Outdated
@@ -15,6 +15,7 @@ require ( | |||
github.com/grpc-ecosystem/grpc-gateway v1.16.0 | |||
github.com/ory/dockertest/v3 v3.9.1 | |||
github.com/osmosis-labs/bech32-ibc v0.3.0-rc1 | |||
github.com/osmosis-labs/osmosis/v7 v7.3.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This backport fix was done wrong -- scanning for this was hard due to not separating out the backport vs the patch to make ti work!
We likely didn't update the import path for an introduced path by the change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fixed all import paths but this was left unused - thanks for catching that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See last comment about import
6feea69
to
0ab359e
Compare
Ah yeah, since there were many conflicts, I had to I will keep this in mind next time though and try to preserve history |
Yeah that totally makes sense for fixing conflicts. TBH thats probably fine most of the time, this just had the unfortunate one-off of being mixed with the proto change I backported @xBalbinus PR and fixed v10.x here: #2074 I suggest we merge that + get mergify to remake this backport (or we merge conflicts) |
Will remake this after #2074 |
This is an automatic backport of pull request #1857 done by Mergify.
Cherry-pick of ee48cf5 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com