Skip to content
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

Resolve syncing conflicts from repo_sync_working_branch to public #137

Merged
merged 26 commits into from
Nov 5, 2024

Conversation

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

Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to public.

Copy link
Contributor Author

Learn Build status updates of commit 699e1d2:

❌ 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 699e1d2086def3f71cb12e16050e8168d270dfd4 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit bea483c85e8751085bc7642bdd37a08602fe3e7d). 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:

@learn-build-service-prod learn-build-service-prod bot merged commit 90e19e2 into public Nov 5, 2024
Copy link
Contributor Author

Learn Build status updates of commit 90e19e2:

✅ Validation status: passed

File Status Preview URL Details
CloudAppSecurityDocs/ops-guide/ops-guide-daily.md ✅Succeeded
defender-endpoint/breadcrumb/toc.yml ✅Succeeded
defender-endpoint/health-status.md ✅Succeeded
defender-endpoint/TOC.yml ✅Succeeded
defender-office-365/breadcrumb/toc.yml ✅Succeeded
defender-office-365/mdo-sec-ops-manage-incidents-and-alerts.md ✅Succeeded
defender-office-365/TOC.yml ✅Succeeded

For more details, please refer to the build report.

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.

7 participants