Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to main #4211

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 2 commits into from
Oct 12, 2022

Conversation

opbld15
Copy link
Contributor

@opbld15 opbld15 commented Oct 11, 2022

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

* Document ARM64 unwind handling for return address signing

* Update date, fix step numbers

* Fix style, grammar in Arm64 Exception

Co-authored-by: opbld17 <[email protected]>
Co-authored-by: Colin Robertson <[email protected]>
Co-authored-by: opbld16 <[email protected]>
Co-authored-by: opbld15 <[email protected]>
Co-authored-by: Martin Storsjö <[email protected]>
Co-authored-by: prmerger-automator[bot] <40007230+prmerger-automator[bot]@users.noreply.github.com>
@opbld31
Copy link

opbld31 commented Oct 11, 2022

Learn Build status updates of commit cfc4218:

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

@prmerger-automator
Copy link
Contributor

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

@opbld31
Copy link

opbld31 commented Oct 11, 2022

Learn Build status updates of commit 3c3e94f:

✅ Validation status: passed

File Status Preview URL Details
docs/build/arm64-exception-handling.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:

@prmerger-automator
Copy link
Contributor

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

@colin-home colin-home merged commit 2b97485 into main Oct 12, 2022
@colin-home colin-home deleted the FromPrivateLiveToMaster branch October 12, 2022 00:08
mstorsjo pushed a commit to mstorsjo/cpp-docs that referenced this pull request Oct 12, 2022
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.

5 participants