Record upstream LeanType v3.9.1 ancestry#115
Merged
Merged
Conversation
Switches offline proofreader to llamacpp-kotlin GGUF and updates model settings UI to resolve 16 KB page alignment compatibility warnings.
…s strings update.
…riodically in dictionary word iteration
… by checking neighbors
… next-word bigram prediction boost
…y queries and optimizing sleep schedule
… querying with cleaned word string
…hape length mismatch penalty
…resampling to minimize memory allocations
…ory and personal dictionaries
…loader preferences
… inline path alloc, self-learning user boost
Only strip trailing space before space-stripping punctuation (]})':;!?,.) when the space was auto-inserted by the keyboard (SpaceState WEAK/PHANTOM/SWAP_PUNCTUATION). Manual spaces (SpaceState.NONE) must never be deleted. Bug introduced in 97802ea.
This file contains hidden or 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
7 participants
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.
What this is
PR #114 brought the upstream v3.9.1 code into
dev, but GitHub merged it as a squash commit. That means the code landed, but the upstream parent394bb60074138ce7e6eaa179cfd46446970ea2d6was not recorded as an ancestor ofdev.This PR fixes only the ancestry/topology issue. It is an
oursmerge commit with no file changes:dev(7b5bc5d49d96458554cbe2b81d8e83b5105aa6ab)394bb60074138ce7e6eaa179cfd46446970ea2d6)Important merge instruction
Do not squash-merge this PR.
It must be merged with a normal merge commit so
394bb600...becomes an ancestor ofdev. If this is squash-merged, it will not fix the problem.Why this matters
Without this ancestry marker, future upstream merges will continue to use the old merge-base and re-conflict against the whole historical fork divergence, despite the v3.9.1 code already being present.
Verification
Locally, this branch has no diff from current
dev:And the branch tip has both parents:
After merge, verify:
git fetch origin git merge-base --is-ancestor 394bb60074138ce7e6eaa179cfd46446970ea2d6 origin/dev # exit 0