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.

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

fix(fork): proposer fork after syncing with multiple forks #1263

Merged
merged 9 commits into from
Dec 3, 2024

Conversation

srene
Copy link
Contributor

@srene srene commented Dec 2, 2024

PR Standards

Opening a pull request should be able to meet the following requirements

--

PR naming convention: https://hackmd.io/@nZpxHZ0CT7O5ngTp0TP9mg/HJP_jrm7A


Close #1258 #1246

<-- Briefly describe the content of this pull request -->

For Author:

  • Targeted PR against correct branch
  • included the correct type prefix in the PR title
  • Linked to Github issue with discussion and accepted design
  • Targets only one github issue
  • Wrote unit and integration tests
  • All CI checks have passed
  • Added relevant godoc comments

For Reviewer:

  • confirmed the correct type prefix in the PR title
  • Reviewers assigned
  • confirmed all author checklist items have been addressed

After reviewer approval:

  • In case targets main branch, PR should be squashed and merged.
  • In case PR targets a release branch, PR should be rebased.

@srene srene self-assigned this Dec 2, 2024
@srene srene requested a review from a team as a code owner December 2, 2024 17:05
@srene srene marked this pull request as draft December 2, 2024 17:05
@srene srene marked this pull request as ready for review December 3, 2024 12:41
@srene srene marked this pull request as draft December 3, 2024 13:15
block/fork.go Show resolved Hide resolved
Copy link
Contributor

@danwt danwt left a comment

Choose a reason for hiding this comment

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

Seems reasonable, although I haven't gone in depth

@srene srene merged commit c0e39f9 into main Dec 3, 2024
4 checks passed
@srene srene deleted the srene/instruction-fix branch December 3, 2024 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants