Resolve syncing conflicts from FromPrivateLiveToMaster to main

[learn-build-service-prod]

Pull request opened by Docs to resolve syncing conflicts from FromPrivateLiveToMaster to main.

[prmerger-automator]

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) have been notified to review your proposed change.

[learn-build-service-prod]

Learn Build status updates of commit 84c48e9:

❌ 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 84c48e96f3591313e0c434709e0477c3e6eb836a in branch FromPrivateLiveToMaster of repository https://github.com/MicrosoftDocs/cpp-docs into branch main (commit 914e931434a1f5b63817df13e30fe3636c428cac). 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:

• Try searching the learn.microsoft.com contributor guides
• Post your question in the Learn support channel

[Court72]

@TylerMSFT - This sync PR appears to be stuck because of a merge conflict. Can you resolve the conflict and, if appropriate, merge the PR? Thanks!

[learn-build-service-prod]

Learn Build status updates of commit 09d8747:

✅ Validation status: passed

File	Status	Preview URL	Details
docs/assembler/masm/processor-manufacturer-programming-manuals.md	✅Succeeded
docs/standard-library/thread-class.md	✅Succeeded

For more details, please refer to the build report.

For any questions, please:

• Try searching the learn.microsoft.com contributor guides
• Post your question in the Learn support channel

[prmerger-automator]

PRMerger Results

Issue	Description
File Change Percent	This PR contains file(s) with more than 30% file change.

[TylerMSFT]

#sign-off