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

docs: fix for links (backport #18816) #18819

Merged
merged 3 commits into from
Dec 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

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

On branch mergify/bp/release/v0.47.x/pr-18816
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit a06b3a3f6.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/learn/learn.md

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit a06b3a3)

# Conflicts:
#	docs/learn/learn.md
@mergify mergify bot requested a review from a team as a code owner December 19, 2023 12:48
@mergify mergify bot added the conflicts label Dec 19, 2023
@samricotta
Copy link
Contributor

Not sure why this is saying it has conflicts

@julienrbrt
Copy link
Member

Not sure why this is saying it has conflicts

because it was modifying the wrong file.

@julienrbrt julienrbrt enabled auto-merge (squash) December 19, 2023 14:21
@julienrbrt julienrbrt disabled auto-merge December 19, 2023 14:22
@julienrbrt julienrbrt merged commit 929e76b into release/v0.47.x Dec 19, 2023
8 of 17 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-18816 branch December 19, 2023 14:22
MSalopek pushed a commit to informalsystems/cosmos-sdk that referenced this pull request Feb 27, 2024
@faddat faddat mentioned this pull request Mar 20, 2024
12 tasks
emidev98 pushed a commit to terra-money/cosmos-sdk that referenced this pull request Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🥳 Done
Development

Successfully merging this pull request may close these issues.

2 participants