Skip to content
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.

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

Merge main into live #10494

Closed
wants to merge 8 commits into from
Closed

Merge main into live #10494

wants to merge 8 commits into from

Conversation

dotnet-policy-service[bot]
Copy link
Contributor

Please don't squash-merge this PR.

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-Meta Concerns something that extends across runtime area boundaries, for example, IDisposable. label Oct 3, 2024
Copy link

Learn Build status updates of commit 1ba74fe:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit 1ba74fead6321b6c0cd3f5611f1773ca9774f01b in branch main of repository https://github.com/dotnet/dotnet-api-docs into branch live (commit 1718c2bd1dae25a0cbf4e59a1425d7c8f7dc451c). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

For any questions, please:

* Update `HttpHeaders.Add` exception docs

* Update HttpHeaders.xml
Copy link

Learn Build status updates of commit f985b66:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit f985b666980b5983b22d629fb50b43fe45336cb2 in branch main of repository https://github.com/dotnet/dotnet-api-docs into branch live (commit 1718c2bd1dae25a0cbf4e59a1425d7c8f7dc451c). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

For any questions, please:

* Port System.IO.Compression docs from RC1

* Apply suggestions from code review

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>

---------

Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com>
Copy link

Learn Build status updates of commit 8022d8a:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit 8022d8a6a37d92e81f4b11403a20f865dc7fcf74 in branch main of repository https://github.com/dotnet/dotnet-api-docs into branch live (commit 1718c2bd1dae25a0cbf4e59a1425d7c8f7dc451c). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

For any questions, please:

@gewarren gewarren mentioned this pull request Oct 4, 2024
@gewarren gewarren closed this Oct 4, 2024
auto-merge was automatically disabled October 4, 2024 15:15

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-Meta Concerns something that extends across runtime area boundaries, for example, IDisposable. :octocat: auto-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants