[20241217] merge compatible into develop #16436
Merged
+122
−117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update code for simplified snarky interface
…ne_test_quiet_logs-package-decl Remove inline_test_quiet_logs package declaration
…snark [trivial] Transaction_snark: remove old comment reg. type constraints
…ed_prime [trivial] Pickles: document to_field_checked'
…kles-scalar-challenge [trivial] Pickles/scalar_challenge: remove old comment
|
!ci-build-me |
dkijania
approved these changes
Dec 17, 2024
svv232
approved these changes
Dec 18, 2024
volhovm
approved these changes
Dec 18, 2024
querolita
approved these changes
Dec 18, 2024
There was a problem hiding this comment.
Looks good to me. But I have a question. The new commit checked out for snarky does not seem to be the current master but a commit from 11thDec. I can see you have made commits into the master branch ever since. Is that expected? Or should those other changes be also included and thus check out a6d3ccbf4e4ffdea595fc2c9bb17fbea8033fc9c instead?
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explain your changes:
git checkout develop && git fetch && git reset --hard origin/develop && git checkout compatible && git reset --hard origin/compatible && git checkout develop && git checkout -b dw/merge-compatible-20241217 && git merge compatibleExplain how you tested your changes:
Checklist: