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

Fix order for JoinSwapShareAmountOut CLI args (backport #3942) #3948

Merged
merged 3 commits into from
Jan 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2023

This is an automatic backport of pull request #3942 done by Mergify.
Cherry-pick of 3e26ec2 has failed:

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

You are currently cherry-picking commit 3e26ec2e.
  (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:   x/gamm/README.md
	modified:   x/gamm/client/cli/tx.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* fix order for JoinSwapShareAmountOut args

* Revert "fix order for JoinSwapShareAmountOut args"

This reverts commit 7991c1c.

* change help text

* add line to changelog

(cherry picked from commit 3e26ec2)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jan 9, 2023
@github-actions github-actions bot added C:CLI C:docs Improvements or additions to documentation C:x/gamm Changes, features and bugs related to the gamm module. labels Jan 9, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
@ValarDragon ValarDragon merged commit 95b6cb5 into v13.x Jan 9, 2023
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3942 branch January 9, 2023 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:docs Improvements or additions to documentation C:x/gamm Changes, features and bugs related to the gamm module. conflicts
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants