Extended-tokens: Fix merge conflict after rebase - #34987
Merged
Mitch-At-Work merged 2 commits intoAug 6, 2025
Merged
Conversation
Mitch-At-Work
requested review from
a team,
Justin Slone (JustSlone),
Juraj Kapsiar (jurokapsiar),
Marcos Moura (marcosmoura) and
Tudor Popa (tudorpopams)
as code owners
August 6, 2025 16:59
|
Pull request demo site: URL |
Mitch-At-Work
merged commit Aug 6, 2025
7d5d318
into
microsoft:extended-tokens
12 of 14 checks passed
Mitch-At-Work
added a commit
that referenced
this pull request
Aug 20, 2025
Force merging as it is a simple rebase resolution in feature branch
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
1 participant
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.
This pull request makes minor updates to dependency versions in the
react-buttonpackage and resolves a merge conflict in the.github/CODEOWNERSfile. These changes help keep dependencies up to date and ensure the correct assignment of code ownership.Dependency updates:
@fluentuidependencies inpackages/react-components/react-button/library/package.jsonto newer versions, improving compatibility and access to recent bug fixes and features.Code ownership:
.github/CODEOWNERSand clarified code ownership forpackages/semantic-tokensandreact-tagsrelated folders.