Skip to content

Conflict resolution #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Apr 10, 2025
Merged

Conflict resolution #8

merged 4 commits into from
Apr 10, 2025

Conversation

ritz078
Copy link
Collaborator

@ritz078 ritz078 commented Apr 10, 2025

Closes

✅ Pull Request Checklist:

  • Included link to corresponding React Spectrum GitHub Issue.
  • Added/updated unit tests and storybook for this change (for new code or code which already has tests).
  • Filled out test instructions.
  • Updated documentation (if it already exists for this component).
  • Looked at the Accessibility Practices for this feature - Aria Practices

📝 Test Instructions:

🧢 Your Project:

@Copilot Copilot AI review requested due to automatic review settings April 10, 2025 14:14
Copilot
Copilot AI reviewed Apr 10, 2025
View reviewed changes
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

@ritz078 ritz078 merged commit 8ad1b83 into develop Apr 10, 2025
0 of 10 checks passed
ritz078 added a commit that referenced this pull request Apr 10, 2025
@ritz078 @LFDanLu @ToyWalrus
Conflict resolution (#8)
cffab75 
* chore: Fix generated code sample for S2 TooltipTrigger docs (adobe#8000)

* Fix generated code sample for S2 TooltipTrigger docs

* review

* inlining

* fix: export SortDescriptor type from S2 (adobe#8030)

* Conflict resolution

---------

Co-authored-by: Daniel Lu <[email protected]>
Co-authored-by: Trevor Howell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

Copilot code review Copilot Copilot left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ritz078 @LFDanLu @ToyWalrus