Resolve syncing conflicts from FromPrivateLiveToMaster to main #4065

opbld16 · 2022-07-27T17:35:59Z

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

…ding page

…o objects in rtos-view

…d hub

…ddedDocs Merging new content on administrator authority. Dev/gcampbell/adding embedded docs

7/22 AM Publishing

* Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (#4430) * 7/19/2022 AM Publish (#4424) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/20/2022 AM Publish (#4426) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/21/2022 AM Publish (#4427) * Follow up 4221 Acrolinx score for TN035 * Fix heading style * Update C++-specific template info * Fix links to raw and rendered markdown Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * crtsetdbgflag.md: _CrtCheckMemory is not called by default Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> * wordsmith * clarify wording * wording Co-authored-by: Feng Xu <fenxu@microsoft.com> Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: PRMerger20 <prmrgr20@microsoft.com>

PRMerger14 · 2022-07-27T17:36:15Z

@Taojunshen : Thanks for your contribution! The author(s) have been notified to review your proposed change.

opbld30 · 2022-07-27T17:36:52Z

Docs Build status updates of commit beb2379:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error: PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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 docs.microsoft.com contributor guides
Post your question in the Docs support channel

Jak-MS · 2022-07-27T20:23:07Z

@corob-msft - can you take a look? thanks!

Jak-MS · 2022-07-27T20:23:15Z

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

* Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (#4430) * 7/19/2022 AM Publish (#4424) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/20/2022 AM Publish (#4426) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/21/2022 AM Publish (#4427) * Follow up 4221 Acrolinx score for TN035 * Fix heading style * Update C++-specific template info * Fix links to raw and rendered markdown Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * crtsetdbgflag.md: _CrtCheckMemory is not called by default Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> * wordsmith * clarify wording * wording Co-authored-by: Feng Xu <fenxu@microsoft.com> Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: PRMerger20 <prmrgr20@microsoft.com>

PRMerger14 · 2022-07-28T17:38:15Z

@Taojunshen : Thanks for your contribution! The author(s) have been notified to review your proposed change.

opbld30 · 2022-07-28T17:39:04Z

Docs Build status updates of commit bafa799:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error: PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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 docs.microsoft.com contributor guides
Post your question in the Docs support channel

* Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main) (#4430) * 7/19/2022 AM Publish (#4424) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/20/2022 AM Publish (#4426) * Follow up 4221 Acrolinx score for TN035 * Fix heading style Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * 7/21/2022 AM Publish (#4427) * Follow up 4221 Acrolinx score for TN035 * Fix heading style * Update C++-specific template info * Fix links to raw and rendered markdown Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> * crtsetdbgflag.md: _CrtCheckMemory is not called by default Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Taojunshen <v-jutao@microsoft.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> * wordsmith * clarify wording * wording Co-authored-by: Feng Xu <fenxu@microsoft.com> Co-authored-by: JiayueHu <36248303+JiayueHu@users.noreply.github.com> Co-authored-by: Colin Robertson <3836425+corob-msft@users.noreply.github.com> Co-authored-by: Bryan Gold <101299717+19BMG00@users.noreply.github.com> Co-authored-by: opbld16 <opbld16@microsoft.com> Co-authored-by: opbld15 <opbld15@microsoft.com> Co-authored-by: opbld17 <opbld17@microsoft.com> Co-authored-by: Oliver Old <oliver.old@outlook.com> Co-authored-by: Tyler Whitney <TylerMSFT@users.noreply.github.com> Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com> Co-authored-by: PRMerger20 <prmrgr20@microsoft.com>

PRMerger14 · 2022-07-29T17:39:16Z

@Taojunshen : Thanks for your contribution! The author(s) have been notified to review your proposed change.

opbld33 · 2022-07-29T17:39:55Z

Docs Build status updates of commit c24910a:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error: PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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 docs.microsoft.com contributor guides
Post your question in the Docs support channel

opbld33 · 2022-07-29T20:13:31Z

Docs Build status updates of commit a60a202:

✅ Validation status: passed

File	Status	Preview URL	Details
docs/c-runtime-library/reference/crtsetdbgflag.md	✅Succeeded

For more details, please refer to the build report.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

PRMerger19 · 2022-07-29T20:13:33Z

PRMerger Results

Issue	Description
Commits Count	This PR contains more than 15 commits.

opbld30 · 2022-07-29T20:29:59Z

Docs Build status updates of commit a60a202:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error: GitBranchDeletedOrForcePushed] Cannot sync git repo to specified commit because branch FromPrivateLiveToMaster has been deleted or has been force pushed

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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 docs.microsoft.com contributor guides
Post your question in the Docs support channel

gcampbell-msft and others added 30 commits July 11, 2022 16:32

Merge branch 'main' of https://github.com/MicrosoftDocs/cpp-docs

899d27a

add initial doc stubs

2f4b5f3

Initial docs push, contains stubs for some files and a stub for a lan…

cb0713a

…ding page

update some links

de0c1f4

add more cards and links to the Hub page

cd9e213

fix error

e894b92

remove monikor's so it's easy to test, fix rtos-view.md path

d312a7d

fix link

a9aadfc

add more to the sidebar

d589bad

update peripheral view by consolidating to the table, change things t…

ec5ae2d

…o objects in rtos-view

add tabs

ed1e34e

forgot to end tabbed section

6c43f39

fix items after adding tabs

64b62aa

update h1

a61a589

slightly fix some wording

05e2849

add link from C++ and C workloads, features, and libraries to embedde…

033bf71

…d hub

move into own directory so that the url is better

0ea1812

fix some warnings

159b4a4

remove next steps that pointed to linux items

5cc7fca

prefer tabbed view vs table

476457b

attempt to add moniker

69c901f

attempt highest moniker in range

e190444

assign to a specific version

3a16181

push again to get new build

207b164

add '=' sign to try and test it

b6cdb67

add metadata for msvc-170

cf4d8bd

add moniker range for index.yml

d6445bb

remove inline moniker since we only need it on the files themselves

0fe105c

Follow up 4221 Acrolinx score for TN035

4fbb1d2

Fix heading style

8958eba

gcampbell-msft and others added 5 commits July 21, 2022 12:23

add 'while debugging' for peripheral-view

5f67eb0

Fix table issue, stray punctuation

0a0e7ef

Merge pull request #4418 from gcampbell-msft/dev/gcampbell/AddingEmbe…

56c97d5

…ddedDocs Merging new content on administrator authority. Dev/gcampbell/adding embedded docs

Merge pull request #4428 from MicrosoftDocs/main

d6b6890

7/22 AM Publishing

PRMerger-2 added the do-not-merge label Jul 27, 2022

PRMerger14 added cpp-ucrt/tech visual-cpp/prod Change sent to author labels Jul 27, 2022

Jak-MS assigned colin-home Jul 27, 2022

PRMerger15 added the aq-pr-triaged Tracking label for the PR review team label Jul 27, 2022

Merge branch 'main' into FromPrivateLiveToMaster

a60a202

PRMerger10 added the review-team-triage label Jul 29, 2022

PRMerger19 added the needs-human-review label Jul 29, 2022

colin-home approved these changes Jul 29, 2022

View reviewed changes

colin-home merged commit adb6979 into main Jul 29, 2022

colin-home deleted the FromPrivateLiveToMaster branch July 29, 2022 20:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4065

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4065

Uh oh!

opbld16 commented Jul 27, 2022

Uh oh!

PRMerger14 commented Jul 27, 2022

Uh oh!

opbld30 commented Jul 27, 2022

Uh oh!

Jak-MS commented Jul 27, 2022

Uh oh!

Jak-MS commented Jul 27, 2022

Uh oh!

PRMerger14 commented Jul 28, 2022

Uh oh!

opbld30 commented Jul 28, 2022

Uh oh!

PRMerger14 commented Jul 29, 2022

Uh oh!

opbld33 commented Jul 29, 2022

Uh oh!

opbld33 commented Jul 29, 2022

Uh oh!

PRMerger19 commented Jul 29, 2022

Uh oh!

opbld30 commented Jul 29, 2022

Uh oh!

Uh oh!

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4065

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4065

Uh oh!

Conversation

opbld16 commented Jul 27, 2022

Uh oh!

PRMerger14 commented Jul 27, 2022

Uh oh!

opbld30 commented Jul 27, 2022

❌ Validation status: errors

Uh oh!

Jak-MS commented Jul 27, 2022

Uh oh!

Jak-MS commented Jul 27, 2022

Uh oh!

PRMerger14 commented Jul 28, 2022

Uh oh!

opbld30 commented Jul 28, 2022

❌ Validation status: errors

Uh oh!

PRMerger14 commented Jul 29, 2022

Uh oh!

opbld33 commented Jul 29, 2022

❌ Validation status: errors

Uh oh!

opbld33 commented Jul 29, 2022

✅ Validation status: passed

Uh oh!

PRMerger19 commented Jul 29, 2022

PRMerger Results

Uh oh!

opbld30 commented Jul 29, 2022

❌ Validation status: errors

Uh oh!

Uh oh!