Revert "add WarningsAsMessages, WarningsAsErrors, WarningsNotAsErrors and Tre…"#11041
Merged
surayya-MS merged 2 commits intomainfrom Nov 29, 2024
Merged
Conversation
… and Tre…" This reverts commit 4dff69f.
surayya-MS
approved these changes
Nov 26, 2024
Member
Author
|
After some further discussion we've decided against reverting. |
…hers-without-prefix
JanKrivanek
approved these changes
Nov 29, 2024
Member
Author
|
/backport to vs17.12 |
Contributor
|
Started backporting to vs17.12: https://github.com/dotnet/msbuild/actions/runs/12196274590 |
Contributor
|
@SimaTian an error occurred while backporting to vs17.12, please check the run log for details! Error: @SimaTian is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=SimaTian |
Member
Author
|
/backport to vs17.12 |
Contributor
|
Started backporting to vs17.12: https://github.com/dotnet/msbuild/actions/runs/12196313675 |
Contributor
|
@SimaTian backporting to vs17.12 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert "add WarningsAsMessages, WarningsAsErrors, WarningsNotAsErrors and Tre…"
Using index info to reconstruct a base tree...
M documentation/wiki/ChangeWaves.md
M src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs
M src/Shared/Constants.cs
M src/UnitTests.Shared/ObjectModelHelpers.cs
Falling back to patching base and 3-way merge...
Auto-merging src/UnitTests.Shared/ObjectModelHelpers.cs
Auto-merging src/Shared/Constants.cs
Auto-merging src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs
Auto-merging documentation/wiki/ChangeWaves.md
CONFLICT (content): Merge conflict in documentation/wiki/ChangeWaves.md
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 advice.mergeConflict false"
Patch failed at 0001 Revert "add WarningsAsMessages, WarningsAsErrors, WarningsNotAsErrors and Tre…"
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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 #10942
Due to the issue with sdk merge, I'm temporarily withdrawing this PR.
dotnet/sdk#44977