Conflict resolution#8

Merged

ritz078 merged 4 commits intodevelopfrom

ritesh/conflict-res

Apr 10, 2025

Commits on Apr 3, 2025

chore: Fix generated code sample for S2 TooltipTrigger docs (#8000)
LFDanLu
authored

Commits on Apr 4, 2025

fix: export SortDescriptor type from S2 (#8030)
ToyWalrus
authored

Commits on Apr 10, 2025