fork sync conflict with block/buzz main (2026-08-24)

[yjc801]

Automatic sync could not merge block/buzz main (db5617d) into fork main (5f0c41b).

Conflicting files:

desktop/src/features/channels/ui/MembersSidebar.tsx

Resolve in any clone: git fetch upstream && git merge upstream/main, fix, push, close this issue.

Filed by the buzz-fork-sync launchd routine.

[yjc801]

Resolved and pushed as fd739f0.

MembersSidebar.tsx: upstream (block#6670, stabilize members dialog scrolling) split renderMemberCard into a bare card plus a new renderDeferredMemberCard wrapper using content-visibility-auto-member-row, colliding with the fork's inline content-visibility-auto wrapper. Took upstream's structure, kept the fork's presenceResolved prop and three-arg handleAgentLifecycleAction(agent, runtime, presenceStatus).

Verified: tsc --noEmit clean, biome clean, desktop unit tests 5529/5529 pass.