Skip to content

Max byte check (backport #1384)#1388

Merged
lasarojc merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1384
Nov 8, 2023
Merged

Max byte check (backport #1384)#1388
lasarojc merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1384

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2023

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

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

You are currently cherry-picking commit c9b75f5ed.
  (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/guides/go-built-in.md
	both modified:   docs/guides/go.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

* Update go version

go1.21.1 has security fixes

* Update go.mod to reflect go version and module

* Update to 0.38

* Update formatting

* Update to 0.38

* Update formatting

* Refactor PrepareProposal to handle transaction size limit

* Update go version

go1.21.1 has security fixes

* Update go.mod to reflect go version and module

* Update to 0.38

* Update formatting

* Refactor PrepareProposal to handle transaction size limit

* Fix passage sequence

* Fix passage sequence

(cherry picked from commit c9b75f5)

# Conflicts:
#	docs/guides/go-built-in.md
#	docs/guides/go.md
@mergify mergify bot requested a review from a team as a code owner September 22, 2023 14:15
@mergify mergify bot added the conflicts label Sep 22, 2023
@alijnmerchant21 alijnmerchant21 self-assigned this Sep 22, 2023
@alijnmerchant21 alijnmerchant21 added wip Work in progress and removed conflicts labels Sep 23, 2023
Solving conflict.
solving conflict
@lasarojc lasarojc removed conflicts wip Work in progress labels Nov 8, 2023
@lasarojc
Copy link
Contributor

lasarojc commented Nov 8, 2023

Introduces the issue noted in #1583 , which should be solved independently.

@lasarojc lasarojc merged commit e58f2de into v0.38.x Nov 8, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.38.x/pr-1384 branch November 8, 2023 11:04
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