test(mobile): avoid #3344 conflict with current main - #1
Merged
smltr merged 1 commit intoAug 1, 2026
Merged
Conversation
Keep the live-reply regression tests away from main's newly added local-row summary test so both changes merge without conflict. Co-authored-by: Daniel Aguilera <daguiler@gmail.com> Signed-off-by: Daniel Aguilera <daguiler@gmail.com>
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
block/buzz#3344now conflicts with currentmainbecause both branches insert regression coverage at the same location inchannel_messages_provider_test.dart.This follow-up only reorders existing tests on the PR branch: it moves the reconnect-hydration test before the two live-reply tests. No production code or test assertions change.
With this layout, Git's three-way merge retains all three regressions without manual resolution:
live thread summary survives rolling back an unrelated local rowlive non-broadcast reply updates its parent thread summarylive non-broadcast reply stays out of the top-level timelineVerification
git merge-tree --write-tree HEAD origin/main— clean, exit 0just mobile-check— passedjust mobile-test— 826 passed, 1 skippedmain(c286e2c0) — 1,024 passed, 1 skippedgit diff --check— passedThis is intended to be merged into
fix/mobile-live-thread-summaries, after whichblock/buzz#3344should become cleanly mergeable again.