豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#479

Open
learn-build-service-prod[bot] wants to merge 562 commits intopublicfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to public#479
learn-build-service-prod[bot] wants to merge 562 commits intopublicfrom
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.

@prmerger-automator
Copy link
Copy Markdown
Contributor

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

@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 765e7a0:

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

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

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

mberdugo and others added 4 commits April 14, 2026 14:43
Refines the AIAgentsInfo advanced-hunting doc to clarify that the table contains AI agent information and is populated via connectors (Agent 365 and Defender for Cloud Apps / Power Platform). Adds guidance on filtering by registry source (RegistrySource == "A365" and RegistrySource == "PowerPlatform") and reorganizes sample queries into sections for Agent 365 and Power Platform. Also adjusts headings and wording for several sample queries and security notes to improve clarity.
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 034851b:

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

chrisda and others added 3 commits April 20, 2026 14:26
Removed AST for Teams
Update mdo-support-teams-about.md
Auto Publish – main to live - 2026-04-20 22:30 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit b5bff89:

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

poliveria and others added 6 commits April 21, 2026 08:35
Update defender-xdr documentation: bump ms.date to 2026-04-21; clarify that Microsoft 365 Unified Group creation being disabled prevents Teams team creation (not just channel creation) and reword onboarding flow to emphasize on-behalf-of provisioning. Replace numbered verification steps with clearer, labeled guidance for using the Graph API (List group settings) and the Microsoft Graph PowerShell module, and update the corresponding links.
Update date for custom detection rules documentation
…172026

Update Teams Defender Experts troubleshooting doc
Auto Publish – main to live - 2026-04-21 07:30 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 1a42c9c:

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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.