Resolve syncing conflicts from FromPrivateLiveToMaster to main #4433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

TylerMSFT merged 15 commits into main from FromPrivateLiveToMaster

Feb 23, 2023

Contributor

learn-build-service-prod bot commented Feb 23, 2023

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

AnjuDel and others added 14 commits

February 22, 2023 15:36


          rewording ReadString documentation to be more accurate (#4815)

b5c4dee

* reword nmax parameter wording for ReadString to be more accurate


          change suggested directory location

5bf9a91


          acrolinx

f567eec


          incorp review

ac48aea


          Merge pull request #4818 from TylerMSFT/github4428

801e84f

change suggested directory location


          fix path

262de15


          Merge pull request #4819 from TylerMSFT/github

9c37b03

fix path


          improve path

de08bd6


          Merge pull request #4820 from TylerMSFT/github

db24355

improve path


          Confirm merge from FromPublicMasterBranch to main to sync with https:…

d264750

…//github.com/MicrosoftDocs/cpp-docs (branch main) (#4817)

* Update vcperf-commands.md (#4375)

* Update vcperf-commands.md

Update commands according to https://github.com/microsoft/vcperf#command-line-reference

* Update vcperf-commands.md

* Update with grammar fixes for i18n

---------

Co-authored-by: Colin Robertson <[email protected]>

* Update tutorial-import-stl-named-module.md (#4429)

* Update tutorial-import-stl-named-module.md

The Title of the document doesn't reveal that this procedure is only for a command line case.  Suggest altering the titles to reflect this and improve clarity for readers searching for module documentation.

* Update tutorial-import-stl-named-module.md

Changed the capitalization at Microsoft's request.

---------

Co-authored-by: huypub <[email protected]>
Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com>
Co-authored-by: Nelson Daniel Troncoso <[email protected]>
Co-authored-by: Colin Robertson <[email protected]>
Co-authored-by: Centurion Maximus <[email protected]>


          fix casing and wording

874ce80


          acrolinx

5ae176b


          Merge pull request #4821 from TylerMSFT/miscfixes

5aaf3f1

fix casing and wording


          Merge pull request #4822 from MicrosoftDocs/main

a8513c0

2/23 AM Publish

Contributor Author

learn-build-service-prod bot commented Feb 23, 2023

Learn Build status updates of commit a8513c0:

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

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


          Merge branch 'main' into FromPrivateLiveToMaster

a9cd1d7

Contributor

prmerger-automator bot commented Feb 23, 2023

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

prmerger-automator bot added Change sent to author cpp-language/tech visual-cpp/prod do-not-merge labels

Contributor

prmerger-automator bot commented Feb 23, 2023

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

1 similar comment

Contributor

prmerger-automator bot commented Feb 23, 2023

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

Jak-MS self-assigned this

Contributor

prmerger-automator bot commented Feb 23, 2023

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

Jak-MS assigned colin-home and TylerMSFT and unassigned Jak-MS

Contributor

prmerger-automator bot commented Feb 23, 2023

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

1 similar comment

Contributor

prmerger-automator bot commented Feb 23, 2023

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

Contributor

Jak-MS commented Feb 23, 2023

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

prmerger-automator bot added the aq-pr-triaged label

Contributor

prmerger-automator bot commented Feb 23, 2023

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

Contributor Author

learn-build-service-prod bot commented Feb 23, 2023

Learn Build status updates of commit a9cd1d7:

✅ Validation status: passed

File	Status	Preview URL	Details
docs/cpp/tutorial-import-stl-named-module.md	✅Succeeded
docs/mfc/reference/cstdiofile-class.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 learn.microsoft.com contributor guides
Post your question in the Learn support channel

TylerMSFT approved these changes

View reviewed changes

Collaborator

TylerMSFT commented Feb 23, 2023

#sign-off

Collaborator

TylerMSFT commented Feb 23, 2023

@huypub, @Jak-MS - what was the problem, here?

Contributor

huypub commented Feb 23, 2023

@TylerMSFT
I have no idea. I am not responsible for the conflict of the public repo :).

Collaborator

TylerMSFT commented Feb 23, 2023

@huypub, Is it up to me to merge this, then? I'm also thrown by the description here - what is private live to master to main?

Contributor

huypub commented Feb 23, 2023

@TylerMSFT
This is a PR which sync the private master branch into this public repo. I don't know who should be responsible for this kind of PR merge/conflict. Normally without conflict, it should be merged automatically.

TylerMSFT merged commit 2052907 into main

TylerMSFT deleted the FromPrivateLiveToMaster branch

February 23, 2023 23:43

Collaborator

TylerMSFT commented Feb 23, 2023

@huypub, ok. I merged it.

Contributor

colin-home commented Feb 24, 2023

@TylerMSFT
It's rare, but possible for there to be changes in some common files in both the public and private repos that cause a merge conflict. If the build hangs up because of a merge conflict here in the public repo, you can resolve it the same way as in the private repo. Normally, the automation will merge these sync PRs to the public repo without intervention, but if something holds up the process, you can just merge it yourself after fixing whatever caused the problem. Despite the occasional boilerplate comment by the triage editor, don't bother with sign-off hashtags in the public repo. You can and should merge PRs here on your own, after a sanity review for approval.

vaanwd pushed a commit to vaanwd/cpp-docs that referenced this pull request


          Merge pull request MicrosoftDocs#4433 from MugBergerFries/patch-2

4913bbe

Updated C26495

0000854453 linked an issue

that may be closed by this pull request

Closed

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

Labels

aq-pr-triaged Change sent to author cpp-language/tech do-not-merge visual-cpp/prod