History sync (#2024) #2032
Merged
History sync (#2024) #2032
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
LeStarch
reviewed
May 18, 2023
LeStarch
approved these changes
May 18, 2023
|
Sorry my mistake! |
|
@NoahBraasch , mostly mine. I forgot to check the branch before merging. We have now locked master, so that merging is impossible unless specifically unlocked, so these errors will go away! Thanks for the contribution! |
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.
Change Description
Merging master into devel to fix a PR that was merged into master...
Future work
Lock
masterbranch to avoid such mistakes in the future. We may also consider makingdevelthe default branch, since people users should not need to clone thefprimerepo directly anymore because we now havefprime-util new --project