Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to main - #5959

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

Resolve syncing conflicts from FromPrivateLiveToMaster to main#5959
learn-build-service-prod[bot] wants to merge 3 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.

* sorting out deprecated filsystem

* refactor <filesystem> docs so that experiemental stuff is in its own location and doesn't overlap

* Apply batched suggestions from code review

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

* Apply batched suggestions from code review

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

* Fix formatting of function descriptions in documentation

* small edits

* tech review and add spaceship operator to the director_entry class

---------

Co-authored-by: TylerMSFT <12305055+TylerMSFT@users.noreply.github.com>
Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>
…//github.com/MicrosoftDocs/cpp-docs (branch main) (#6802)

* 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>

* Resolve syncing conflicts from FromPrivateLiveToMaster to main (#5953)

* Clarify sentence about updating UI item states (#5955)

Added a question mark to clarify the sentence about updating the state of user-interface items.

* Update acquisition doc for vcpkg (#5957)

* Update acquisition doc for vcpkg

* remove en-us from URL

* use relative link to vcpkg docs

* Update docs/mfc/how-to-update-user-interface-objects.md

Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@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>
Co-authored-by: Daniel Nikolov <114946180+danikolovv@users.noreply.github.com>
Co-authored-by: Hector <v-ndat@microsoft.com>
Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@users.noreply.github.com>
Auto Publish – main to live - 2026-08-31 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 116ad48:

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

1 participant