Skip to content

docs: Fix Discord links in README (backport #1874)#1894

Merged
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1874
Jan 4, 2024
Merged

docs: Fix Discord links in README (backport #1874)#1894
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1874

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 25, 2023

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

On branch mergify/bp/v0.38.x/pr-1874
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit f72d930a6.
  (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 <file>..." to mark resolution)
	both modified:   README.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

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit f72d930)

# Conflicts:
#	README.md
@mergify mergify bot requested a review from a team as a code owner December 25, 2023 13:08
@mergify mergify bot added the conflicts label Dec 25, 2023
@melekes melekes merged commit 907a3c1 into v0.38.x Jan 4, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-1874 branch January 4, 2024 08:27
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.

2 participants