Conflict in editorial view fixed #5789
Open
Conversation
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
Elblinator
approved these changes
Jan 29, 2026
bastianjoel
requested changes
Jan 30, 2026
| // After that, the document should stay as it is. Hence, we remove the ol-colliding-change class | ||
| // from the holder element to the comment. | ||
| if (el.classList.contains(`os-colliding-change-comment`)) { | ||
| if (!el.hasAttribute(`data-change-is-colliding`)) { |
Member
There was a problem hiding this comment.
The purpose of this was to prevent running the procedure on an input that was already processed.
The comment should also be updated to reflect that attributes are now added instead of classes.
Suggested change
| if (!el.hasAttribute(`data-change-is-colliding`)) { | |
| if (el.hasAttribute(`data-comment-change-is-colliding`)) { |
...s/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts
Outdated
Show resolved
Hide resolved
…e-recommendations/services/motion-diff.service/motion-diff.service.ts Co-authored-by: Bastian Rihm <[email protected]>
…e-recommendations/services/motion-diff.service/motion-diff.service.ts Co-authored-by: Bastian Rihm <[email protected]>
Elblinator
approved these changes
Jan 30, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Resolves #5782