Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to main - #5953

Open
learn-build-service-prod[bot] wants to merge 26 commits into
mainfrom
FromPrivateLiveToMaster
Open

Resolve syncing conflicts from FromPrivateLiveToMaster to main#5953
learn-build-service-prod[bot] wants to merge 26 commits into
mainfrom
FromPrivateLiveToMaster

Conversation

@learn-build-service-prod

Copy link
Copy Markdown
Contributor

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

Zack Johnson (zacklj89) and others added 17 commits July 17, 2026 11:26
Add section on Managed C++ limitations with ASan.
Clarify limitations of ASan support for C++/CLI and provide additional notes on potential misleading reports.
Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>
Tyler's feedback / improve wording for better understanding.
Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>
Revised the section on ASan support for C++/CLI to clarify limitations and diagnostics.
Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>
…//github.com/MicrosoftDocs/cpp-docs (branch main) (#6788)

* Update Vectorized STL algorithm documentation to reflect the current stae (#5937)

Since the last update:
 * ARM64 and ARM64EC vectorization was added. Mention of x64 and x86 is removed, as vectorization is now supported on any target, except deprecated `/clr:pure` and `/clr:safe` modes.
 * `includes` is now manually vectorized too
 * `replace_copy` is now manually vectorized too

Also moved `find_end` to `search` / `search_n` group, where it fits better.

* Update header-files-cpp.md (#5938)

Clarify intent of section

* Update documentation on accessing System.String characters (#5940)

* Update documentation on accessing System.String characters

Added important note about treating interior pointers as const and linked to unsafe code best practices.

* Update docs/dotnet/how-to-access-characters-in-a-system-string.md

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Aaron R Robinson <arobins@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Aaron R Robinson <arobins@microsoft.com>

---------

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

* Clarify version prefix for Visual Studio Command Prompt (#5946)

Updated instructions for starting Visual Studio Command Prompt to reflect changes in version specification.

* Add new ARM64 feature arguments to documentation (#5950)

Add new extensions `cssc` and `faminmax` to the `/feature` flag arguments documentation

* atexit: Clarify DLL behavior is the same as _onexit (#5952)

* atexit: Clarify DLL behavior is the same as _onexit

- Document that atexit called from within a DLL will register the
  routine to run when the DLL is unloaded.

atexit is a wrapper around _onexit which already documents this
behavior.

Ref: curl/curl#22383 (comment)

Reported-by: Michał Petryka

Closes #xxxx

* Revise atexit documentation for accuracy

Update the date and clarify DLL behavior for atexit.

---------

Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com>

---------

Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com>
Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com>
Co-authored-by: Alex Guteniev <gutenev@gmail.com>
Co-authored-by: veganaiZe <7102064+veganaiZe@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Co-authored-by: Eric Brumer <ericbr@microsoft.com>
Co-authored-by: Vít Knobloch <67308900+vitknobloch@users.noreply.github.com>
Co-authored-by: Jay Satiro <raysatiro@yahoo.com>
Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com>
…(#6769)

* UUF Fix.

* Remove duplicate customer intent from documentation

Removed duplicate customer intent line from the metadata section.

* Apply suggestions from code review

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

* Update per comment.

* Apply suggestions from code review

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>

---------

Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com>
Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com>
Edit asan-known-issues to clarify limitations in /clr applications
Auto Publish – main to live - 2026-08-20 17:30 UTC
@prmerger-automator

Copy link
Copy Markdown
Contributor

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

@prmerger-automator

Copy link
Copy Markdown
Contributor

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9102f6e:

❌ 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 9102f6edca45106161901681b01bb29f03aa5b9e in branch FromPrivateLiveToMaster of repository https://github.com/MicrosoftDocs/cpp-docs into branch main (commit 58ed50da5659b1fb5fb01f9701db8e86e89ee798). 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.

chcomley (chcomley) and others added 6 commits August 20, 2026 12:25
Updated the date and clarified the note about VCToolsVersion discovery in the MSVC installation guide.
Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>
…-discovery

Document cross-install MSVC toolset discovery
* operator ()

* add static operator[]

* Refine static subscript example

* Apply suggestions from code review

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Clarify static operator qualifiers

---------

Co-authored-by: TylerMSFT <12305055+TylerMSFT@users.noreply.github.com>
Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>
Change comment from Intel to x64 for /arch (x64) flag description consistency.
Co-authored-by: learn-build-service-prod-10[bot] <274431553+learn-build-service-prod-10[bot]@users.noreply.github.com>
Update SSE and AVX descriptions to x64
@v-regandowner

Copy link
Copy Markdown
Contributor

Tyler Whitney (@TylerMSFT) - Can you check on this stuck sync PR?

#label:"aq-pr-triaged"
@MicrosoftDocs/public-repo-pr-review-team

@prmerger-automator prmerger-automator Bot added the aq-pr-triaged Tracking label for the PR review team label Aug 21, 2026
Auto Publish – main to live - 2026-08-21 17:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit b23cc78:

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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants