Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4959

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.

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

Merged
merged 23 commits into from
Feb 28, 2024

Conversation

learn-build-service-prod[bot]
Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor Author

Learn Build status updates of commit cb8ca25:

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

For any questions, please:

@Jak-MS Jak-MS self-assigned this Feb 27, 2024
@Jak-MS Jak-MS assigned TylerMSFT and unassigned Jak-MS Feb 27, 2024
@Jak-MS
Copy link
Contributor

Jak-MS commented Feb 27, 2024

@TylerMSFT - minor merge conflict is preventing this sync from going. Can you take a look?

#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 Feb 27, 2024
Copy link
Contributor Author

Learn Build status updates of commit 54db5ee:

✅ Validation status: passed

File Status Preview URL Details
docs/overview/what-s-new-for-visual-cpp-in-visual-studio.md ✅Succeeded
docs/windows/latest-supported-vc-redist.md ✅Succeeded

For more details, please refer to the build report.

For any questions, please:

Copy link
Contributor

PRMerger Results

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

@TylerMSFT
Copy link
Collaborator

@Jak-MS - fixed the merge conflict. Should be good to go.
#signoff - for good measure ;-)

@Jak-MS Jak-MS merged commit 533991f into main Feb 28, 2024
@Jak-MS Jak-MS deleted the FromPrivateLiveToMaster branch February 28, 2024 15:08
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.

4 participants