Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

docs: Updates to the address lookup table proposal (backport #22269) #22270

Merged
merged 1 commit into from
Jan 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2022

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

On branch mergify/bp/v1.9/pr-22269
Your branch is up to date with 'origin/v1.9'.

You are currently cherry-picking commit ca5591bfa.
  (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:   docs/src/proposals/transactions-v2.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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

automerge label removed due to a CI failure

@jstarry jstarry self-assigned this Jan 4, 2022
@jstarry
Copy link
Contributor

jstarry commented Jan 4, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging docs/src/proposals/transactions-v2.md
CONFLICT (content): Merge conflict in docs/src/proposals/transactions-v2.md
error: could not apply 57f7e0ef3... Updates to the address lookup table proposal (#22269)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 57f7e0ef3... Updates to the address lookup table proposal (#22269)

err-code: 1C63C

@jstarry jstarry force-pushed the mergify/bp/v1.9/pr-22269 branch from 57f7e0e to 1ed2d8c Compare January 4, 2022 22:31
@jstarry jstarry added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Jan 4, 2022
@mergify mergify bot merged commit f4ded6f into v1.9 Jan 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22269 branch January 4, 2022 23:39
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant