-
Notifications
You must be signed in to change notification settings - Fork 124
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
Merge modes big refactor #592
Draft
wismill
wants to merge
13
commits into
xkbcommon:master
Choose a base branch
from
wismill:merges-modes-big-refactor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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
wismill
added
bug
Indicates an unexpected problem or unintended behavior
testing
Indicates a need for improvements or additions to testing
compile-keymap
Indicates a need for improvements or additions to keymap compilation
labels
Jan 14, 2025
This can potentially break some advanced setups that rely on merge modes current propagation, so maybe it is safer to wait for next release while improving the tests. |
wismill
force-pushed
the
merges-modes-big-refactor
branch
3 times, most recently
from
January 15, 2025 11:43
e7253c6
to
6aecd1e
Compare
The merge mode is always set in `HandleSymbolsDef`.
wismill
force-pushed
the
merges-modes-big-refactor
branch
from
January 15, 2025 18:29
6aecd1e
to
892a80a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bug
Indicates an unexpected problem or unintended behavior
compile-keymap
Indicates a need for improvements or additions to keymap compilation
testing
Indicates a need for improvements or additions to testing
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.
Follow-up of #568, with tests and fixes for all components.
Merge modes parameters are aggressively removed, so that:
See this comment from @mahkoh and the follow-up discussion.
TODO: