Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public - #545

Open
learn-build-service-prod[bot] wants to merge 1177 commits into
publicfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to public#545
learn-build-service-prod[bot] wants to merge 1177 commits into
publicfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod

Copy link
Copy Markdown
Contributor

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 8332df8:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9d5111c:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit b346756:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit a821c60:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 62701cf:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 55d87da:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit f1d192e:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 668adfe:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit a3973e4:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 901cb16:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 3658fe6:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 3715a56:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 498e5ff:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 3aa8717:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit ba5c906:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 6b9aa20:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 7a30241:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 91b075f:

❌ 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 ref +refs/pull/545/merge has been deleted or has been force pushed.
 If this is pull request, please ensure it is mergeable (no merge conflict) and open (not closed).

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.

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit a1c52a3:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit bfece6e:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9b50ee8:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 221550f:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 07153a9:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 4d5183f:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit e0615e8:

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

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 45a6f8f:

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

prmerger-automator Bot and others added 2 commits August 26, 2026 10:04
Update date and improve clarity in overview
Auto Publish – main to live - 2026-08-26 12:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 68a425f:

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

* Add CallActivityEvents hunting schema reference

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 2879d2fb-b4ab-490b-96cb-e11e4735efe6

* Address CallActivityEvents review feedback

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Apply suggestion from @Stacyrch140

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Stacy Chambers <102548089+Stacyrch140@users.noreply.github.com>
Copilot-Session: 2879d2fb-b4ab-490b-96cb-e11e4735efe6
Bump ms.date to 07/01/2026 and remove the sentence claiming that existing Teams meetings, chats, channels, and calls are deleted after adding a block entry. This clarifies the Tenant Allow/Block List guidance in defender-office-365/tenant-allow-block-list-teams-domains-configure.md.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 91c4341f-a0c5-4d2a-9caf-7a91f19f5ba8
* Clarify Teams mailbox requirements

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 0008fc20-c9b1-4711-96d3-3c2ea1cc6dd2

* Clarify reporting mailbox restrictions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 0008fc20-c9b1-4711-96d3-3c2ea1cc6dd2

---------

Copilot-Session: 0008fc20-c9b1-4711-96d3-3c2ea1cc6dd2
Auto Publish – main to live - 2026-08-26 17:36 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 8eebba5:

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

Chris Davis (chrisda) and others added 4 commits August 26, 2026 15:50
Consolidated redundant Intune procedures, copy edit and technical edit.
* Update android-configure

Consolidated redundant Intune procedures, copy edit and technical edit.

* Update android-configure.md

* Intune policy standardization

* Update configure-cloud-block-timeout-period-microsoft-defender-antivirus.md

Intune policy standardization, Defender portal policy standardization, and added missing PowerShell procedure.
Auto Publish – main to live - 2026-08-27 07:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9959275:

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

prmerger-automator Bot and others added 6 commits August 27, 2026 09:39
Add Remote tenant group (GDAP) option to URBAC custom role assignment
Revert 'Add Remote tenant group (GDAP) option to URBAC custom role assignment'
…ntegration-1787831778

Update mdash-foundry-integration.md
Auto Publish – main to live - 2026-08-27 12:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit bdc7ad0:

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

anunesms and others added 4 commits August 27, 2026 10:17
* Learn Editor: Update alerts-mdi-classic.md

* Learn Editor: Update alerts-mdi-classic.md
* Learn Editor: Update alerts-xdr.md

* Learn Editor: Update alerts-xdr.md
Auto Publish – main to live - 2026-08-27 17:36 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 54b5011:

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

Mravela and others added 4 commits August 28, 2026 11:55
…ort (#9203)

Add a section covering the DLP to Purview migration tool: prerequisites,
supported scope, the four wizard steps, post-migration review in Purview,
FAQ, known issues, and wizard screenshots.

Add a Non-Microsoft app support section listing the SaaS apps Purview DLP
supports (Box, Dropbox, Google Workspace, Salesforce) with prerequisites
and a pointer to the Purview documentation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… sessions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add known limitation: Teams launched from proxied Google Workspace sessions
Auto Publish – main to live - 2026-08-28 12:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 49c5737:

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

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

Labels

aq-pr-triaged Tracking label for the vendor PR Review team do-not-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.