Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to main - #4065

Merged
Colin Robertson (colin-home) merged 43 commits into
mainfrom
FromPrivateLiveToMaster
Jul 29, 2022
Merged

Colin Robertson (colin-home) merged 43 commits into
mainfrom
FromPrivateLiveToMaster

Conversation

@opbld16

@opbld16 opbld16 commented Jul 27, 2022

Copy link
Copy Markdown
Contributor

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

…ddedDocs

Merging new content on administrator authority.

Dev/gcampbell/adding embedded docs
* 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

Copy link
Copy Markdown
Contributor

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

@opbld30

opbld30 commented Jul 27, 2022

Copy link
Copy Markdown

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:

@Jak-MS

Copy link
Copy Markdown
Contributor

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

@Jak-MS

Copy link
Copy Markdown
Contributor

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

@PRMerger15 PRMerger15 added the aq-pr-triaged Tracking label for the PR review team label Jul 27, 2022
* 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

Copy link
Copy Markdown
Contributor

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

@opbld30

opbld30 commented Jul 28, 2022

Copy link
Copy Markdown

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:

* 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

Copy link
Copy Markdown
Contributor

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

@opbld33

opbld33 commented Jul 29, 2022

Copy link
Copy Markdown

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:

@opbld33

opbld33 commented Jul 29, 2022

Copy link
Copy Markdown

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:

@PRMerger19

Copy link
Copy Markdown
Contributor

PRMerger Results

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

@colin-home
Colin Robertson (colin-home) deleted the FromPrivateLiveToMaster branch July 29, 2022 20:29
@opbld30

opbld30 commented Jul 29, 2022

Copy link
Copy Markdown

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:

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.