Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public - #545

Open
learn-build-service-prod[bot] wants to merge 983 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 983 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.

prmerger-automator Bot and others added 3 commits August 4, 2026 14:58
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
prmerger-automator Bot and others added 2 commits August 13, 2026 06:03
…nder-endpoint-re-1786442963

Update microsoft-defender-endpoint-releases.md
Auto Publish – main to live - 2026-08-13 07:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 2740c59:

❌ 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 2740c59a048c7b07eae745c02bd84ce858a0fd02 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.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Updated the date for the Microsoft Foundry integration and added prerequisites for creating a content filter. Revised steps for creating a Foundry project and deploying required models, including API key and project endpoint instructions.
* Add ATA end-of-life banner to MDI docs

Adds a reusable ATA end-of-life include and surfaces it on the ATA
migration article. Updates the technical FAQ, which still stated that
ATA extended support was ongoing.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 66eb1582-4696-42da-a303-3876a95bf442

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Fix Advanced Threat Analytics include

Rename the include, add required metadata, and restore its use in the migration article.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3d3fa636-cb10-4437-9d7f-5eec31b52078

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot-Session: 66eb1582-4696-42da-a303-3876a95bf442
Copilot-Session: 3d3fa636-cb10-4437-9d7f-5eec31b52078
Updated the documentation to clarify that Codename MDASH uses Microsoft Foundry during agentic scans and provided additional details on access configuration.
Corrected wording for clarity in access instructions.
Update MDASH Foundry integration instructions
…-defender-endpoint-re-1786610600

Update microsoft-defender-endpoint-releases.md
Add Azure Government support for Antimalware and DNS
Auto Publish – main to live - 2026-08-13 12:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit d01fe5c:

❌ 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 d01fe5c0ce4e88bea41c46a452a62213f9790e1d 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.

Celeste (CelesteD) and others added 5 commits August 13, 2026 07:58
…on of ConfigurationId column and introduce a new column called ConfigurationBenchmarkVersion

Transferred from public PR #563 (author: yuvalmarciano) for PR build and validation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 9ff92937-17c2-4869-813f-2eb8f6fbbc1d
Updated the date for the Defender CLI setup documentation and added prerequisites for running Defender CLI commands.
Update Defender CLI setup documentation
…ables

Fix Baseline security assessment tables documentation - fix description of ConfigurationId column and introduce a new column called ConfigurationBenchmarkVersion
Auto Publish – main to live - 2026-08-13 17:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 56aba6c:

❌ 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 56aba6c181eb57ccac402d43728bde82c280a222 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.

* Restructure SAP overview into landscape and applications pages

Split the Microsoft Sentinel solutions for SAP overview so the top-level page frames the SAP landscape (foundation solutions and extensions), and a new SAP applications overview covers solution-scoped content.

- Refactor sentinel/sap/solution-overview.md into a landscape overview with sections for recent SAP attacks, foundation solutions (SAP applications, SAP BTP), and extensions (SAP LogServ, partner add-ons, community contributions), plus solution boundaries, SIEM/SOAR, investigation, and certification.

- Add sentinel/sap/sap-applications-overview.md covering solution components (agentless data connector, SAP Integration Suite solution package, security content), SAP data sources including HANA, LogServ, and ASIM-normalized connectors, threat detection coverage, monitored configuration, and solution pricing.

- Promote the landscape overview to the top level of the SAP TOC and nest the applications overview under SAP applications.

- Link deployment-overview.md back to the applications overview and cross-link the applications overview to deployment-overview for deeper component details.

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

Copilot-Session: f52202b6-1ef4-4768-8118-77918f76578e

* Fix Solution pricing bookmarks after SAP overview split

The Solution pricing section moved from sap/solution-overview.md to sap/sap-applications-overview.md. Update the two remaining callers so the anchor resolves.

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

Copilot-Session: f52202b6-1ef4-4768-8118-77918f76578e

---------

Copilot-Session: f52202b6-1ef4-4768-8118-77918f76578e
Auto Publish – main to live - 2026-08-13 22:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit aa1a155:

❌ 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 aa1a15519d84508d1dde4794a6ba2a92d49a3216 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 3 commits August 13, 2026 22:44
Any article copy/technical edits
Auto Publish – main to live - 2026-08-14 07:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit fa6264a:

❌ 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 fa6264a5c3e0eba31d2f201c83cc708e4af21416 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.