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.

Sign up for GitHub

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

Jump to bottom

docs: add ante precision (backport #18709) #18729

Merged
merged 2 commits into from
Dec 13, 2023
Merged

docs: add ante precision (backport #18709) #18729

merged 2 commits into from
Dec 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2023

This is an automatic backport of pull request #18709 done by Mergify.
Cherry-pick of 49825ea has failed:

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

You are currently cherry-picking commit 49825ea40.
  (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/docs/learn/beginner/01-tx-lifecycle.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/circuit/README.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

@julienrbrt @mergify
docs: add ante precision (#18709)
6a80c79 
(cherry picked from commit 49825ea)

# Conflicts:
#	x/circuit/README.md
@mergify mergify bot requested a review from a team as a code owner December 13, 2023 06:55
@mergify mergify bot added the conflicts label Dec 13, 2023
@atheeshp
Copy link
Contributor

@julienrbrt , seems like there are some conflicts

atheeshp
atheeshp approved these changes Dec 13, 2023
View reviewed changes
Copy link
Contributor

@atheeshp atheeshp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-approving

@julienrbrt julienrbrt self-assigned this Dec 13, 2023
julienrbrt
julienrbrt requested changes Dec 13, 2023
View reviewed changes
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts, will fix

@julienrbrt julienrbrt removed their assignment Dec 13, 2023
@julienrbrt julienrbrt merged commit e284927 into release/v0.50.x Dec 13, 2023
33 of 37 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18709 branch December 13, 2023 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@atheeshp atheeshp atheeshp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@atheeshp @julienrbrt