[fix] Handle modifiers #42
Merged
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
Content is now a) not modified in-place, and b) retained in full on conflicts
But does not deal with conflicts!
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.
Fix #36
Fix #39
This PR is a start for addressing the problem that some nodes have many values associated with them. It introduces the notion that there's a primary value (e.g. the name of a method or field), and secondary values (e.g. modifiers).
As conflicts related to secondary values can't be resolved during the base 3DM merge without introducing significant complexity, they are resolved after that, in the
Spoon3dmMergeclass. Currently, only conflicts that can be automatically resolved are handled properly. Conflicts that can't be automatically resolved will lead to the primary value being flagged as conflicting.This means that a new way of handling content conflicts must be introduced.