fix: merge keeps matching label/comments/color instead of joining duplicates#532
Open
FelipeDefensor wants to merge 1 commit into
Open
Conversation
…oining duplicates When every selected hierarchy has the same label, comments, or color, the merged unit adopts that single value. Previously identical labels and comments were concatenated with the merge separator, and the color was always dropped on merge.
Collaborator
Author
|
Forgot to ask for a review on this one, sorry. |
azfoo
requested changes
Jun 30, 2026
azfoo
left a comment
azfoo
left a comment
Collaborator
There was a problem hiding this comment.
just that one line, good to go otherwise.
Comment on lines
+411
to
+413
| colors = [h.color for h in hierarchies] | ||
| if colors[0] and all(c == colors[0] for c in colors[1:]): | ||
| attr_to_new_value["color"] = colors[0] |
Collaborator
There was a problem hiding this comment.
perhaps:
colors = (h.color for h in hierarchies)
if len(colors) == 1: ...
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
2 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.
Summary
Test plan
pytest -n auto tests/timelines/hierarchy tests/ui/timelines/hierarchy— 172 passed.