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

pull_request_template.md: specify merges are OK #164

Merged
merged 1 commit into from
Apr 4, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Apr 4, 2023

Description

More realistic PR message. Rebases can waste time for squashed PRs

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.

@spalladino spalladino merged commit 7372e9d into master Apr 4, 2023
@spalladino spalladino deleted the adam/pr-wording-proposal branch April 4, 2023 12:25
ludamad pushed a commit that referenced this pull request Apr 14, 2023
* initial version of merge rollup

* move previous rollup data from base to merge and update root

* fix ci

* add rollup subtree height

* add tests

* test: change expectd failure regex (#164)

* just use one type of public inputs for base/merge (#168)

* this better work and ignore wasm tests

---------

Co-authored-by: Lasse Herskind <[email protected]>
ludamad pushed a commit that referenced this pull request Apr 17, 2023
* initial version of merge rollup

* move previous rollup data from base to merge and update root

* fix ci

* add rollup subtree height

* add tests

* test: change expectd failure regex (#164)

* just use one type of public inputs for base/merge (#168)

* this better work and ignore wasm tests

---------

Co-authored-by: Lasse Herskind <[email protected]>
ludamad pushed a commit that referenced this pull request Apr 17, 2023
* initial version of merge rollup

* move previous rollup data from base to merge and update root

* fix ci

* add rollup subtree height

* add tests

* test: change expectd failure regex (#164)

* just use one type of public inputs for base/merge (#168)

* this better work and ignore wasm tests

---------

Co-authored-by: Lasse Herskind <[email protected]>
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.

2 participants