-
Notifications
You must be signed in to change notification settings - Fork 29
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
Smaller optimizations for custom parser since before incorrect force push #257
Merged
jfmengels
merged 254 commits into
stil4m:master
from
lue-bird:smaller-optimizations-for-custom-parser-since-before-incorrect-force-push
Aug 30, 2024
Merged
Smaller optimizations for custom parser since before incorrect force push #257
jfmengels
merged 254 commits into
stil4m:master
from
lue-bird:smaller-optimizations-for-custom-parser-since-before-incorrect-force-push
Aug 30, 2024
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
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.
starts at #256 without the incorrect rebase into force-push.
This branch rebased, accepting all commits until
git merge-base smaller-optimizations-for-custom-parser-since-before-incorrect-force-push upstream/master
(which isa06ca8a68744204edd00d38de4c29970dfa85b44
),followed by a
git rebase --onto upstream/master <the merge base>
and finally a force-push.In case this overwrites some changes you've done since or is otherwise problematic, please comment.
Before, I tried
rebase -Xtheirs
andrebase -X ours
but these seem to have included commits from upstream/master that messed up future history from my branch.(my old laptop broke down, so both of these are from my new one)
One change I really like is that now e.g.
(\a -> { x = 3 }).x
doesn't parse.