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

osmomath: QuoTruncate with no reallocation (backport #6428) #6471

Merged
merged 2 commits into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #6428 done by Mergify.
Cherry-pick of 114f055 has failed:

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

You are currently cherry-picking commit 114f055f.
  (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:   osmomath/decimal.go
	modified:   osmomath/decimal_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   x/concentrated-liquidity/math/math.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

@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

@hieuvubk please help with conflicts on this backport ser

@p0mvn
Copy link
Member

p0mvn commented Sep 20, 2023

@hieuvubk please help with conflicts on this backport ser

NVM. Resolved

@p0mvn p0mvn merged commit 16e7593 into v19.x Sep 20, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6428 branch September 20, 2023 20:32
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.

None yet

2 participants