Skip to content

docs: Fix references about DeliverTx (backport #2330)#2342

Merged
melekes merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2330
Feb 14, 2024
Merged

docs: Fix references about DeliverTx (backport #2330)#2342
melekes merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-2330

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2024

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

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

You are currently cherry-picking commit a6cc64d07.
  (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:   docs/introduction/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/core/running-in-production.md
	both modified:   docs/core/subscription.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

close: #2224

Updated documentation that reference DeliverTx. Also modified a bit some
content on the Introduction page.

This will need to be back ported to v0.38.x and v1.x

(cherry picked from commit a6cc64d)

# Conflicts:
#	docs/core/running-in-production.md
#	docs/core/subscription.md
@mergify mergify bot requested a review from a team as a code owner February 14, 2024 11:48
@mergify mergify bot added the conflicts label Feb 14, 2024
@melekes melekes merged commit 0a2b829 into v0.38.x Feb 14, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-2330 branch February 14, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants