Merged
Conversation
nohwnd
previously approved these changes
Aug 7, 2025
drognanar
previously approved these changes
Aug 7, 2025
Member
Author
|
/backport to rel/3.10 |
Contributor
|
Started backporting to rel/3.10: https://github.com/microsoft/testfx/actions/runs/16798273530 |
Contributor
|
@Youssef1313 backporting to rel/3.10 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert Assert.That obsoletion
Using index info to reconstruct a base tree...
M src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Revert Assert.That obsoletion
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.10 failed, the patch most likely resulted in conflicts: $ git am --continue
Applying: Revert Assert.That obsoletion
Applying: Fix more
Using index info to reconstruct a base tree...
M src/TestFramework/TestFramework/PublicAPI/PublicAPI.Shipped.txt
M src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/TestFramework/TestFramework/PublicAPI/PublicAPI.Shipped.txt
CONFLICT (content): Merge conflict in src/TestFramework/TestFramework/PublicAPI/PublicAPI.Shipped.txt
Auto-merging src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 Fix more
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Youssef1313
force-pushed
the
dev/ygerges/revert-break
branch
from
1cb8b7b to
789f977
Compare
Member
Author
|
/backport to rel/3.10 |
Contributor
|
Started backporting to rel/3.10: https://github.com/microsoft/testfx/actions/runs/16798345673 |
Contributor
|
@Youssef1313 backporting to rel/3.10 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert Assert.That obsoletion
Using index info to reconstruct a base tree...
M src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Revert Assert.That obsoletion
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
nohwnd
approved these changes
Aug 7, 2025
Youssef1313
added a commit
that referenced
this pull request
Aug 7, 2025
…el/3.10) (#6324) Co-authored-by: Youssef1313 <youssefvictor00@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
3 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.
Reverts #5811 per user feedback.