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: AddMut and QuoMut (backport #3779) #3826

Merged
merged 2 commits into from
Dec 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 22, 2022

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

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

You are currently cherry-picking commit ca6ccbd0.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   osmomath/exp2.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

* mut add

* test add mut

* quo  mut

* test quo mut/ remove want from test struct

* refactor exp

* change mutatives code

* change

* not allocaing

* exp change to quomut

* remove file

* refactor quo

* refactor ad

* refactor tests

(cherry picked from commit ca6ccbd)

# Conflicts:
#	osmomath/exp2.go
@mergify mergify bot added the conflicts label Dec 22, 2022
@mergify mergify bot assigned pysel Dec 22, 2022
@ValarDragon ValarDragon merged commit 1189148 into v13.x Dec 22, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3779 branch December 22, 2022 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants