Skip to content

Conversation

Youssef1313
Copy link
Member

Fixes #5581

@Evangelink Evangelink merged commit a650239 into main May 19, 2025
8 checks passed
@Evangelink Evangelink deleted the dev/ygerges/public branch May 19, 2025 18:25
@Youssef1313
Copy link
Member Author

/backport to rel/3.9

Copy link
Contributor

Copy link
Contributor

@Youssef1313 backporting to rel/3.9 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Make ConditionBaseAttribute.Mode public
Applying: Public
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 0002 Public
Error: The process '/usr/bin/git' failed with exit code 128

NOTE: A PR will be created, but needs to be revised manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ConditionBaseAttribute doesn't expose Mode property

2 participants