Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#529

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

Resolve syncing conflicts from repo_sync_working_branch to public#529
learn-build-service-prod[bot] wants to merge 282 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 6ef1f3b:

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

msec-docs-bot Bot and others added 16 commits June 24, 2026 12:40
…l-guywi-ms-04) (#8059)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Fix fictional bookmarks AIRA created

Removed redundant options for enabling UEBA and streamlined the text.

* Remove bookmark to nonexistent content

Removed redundant sentence in the UEBA documentation.

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
…/2] (#8088)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 9

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Fix metadata for PIM in MDO configuration document

* Fix metadata for safe attachments configuration doc

* Update ms.custom metadata in documentation

* Fix formatting in submissions admin review document

* Fix formatting for ms.custom in documentation

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
…l-guywi-ms-06) (#8061)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Fix bad AIRA edit

Updated section header from 'Next steps' to 'Next step'.

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 4

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Fix formatting of ms.custom metadata in document

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 1

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
* Clarify that the Risky IP category is dynamic and can expire

Add a note explaining that the Risky category is assigned automatically
based on threat intelligence and is removed if no further malicious
activity is detected. All other categories are assigned manually.

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

* Apply suggestions from code review

Co-authored-by: AbbyMSFT <88824859+AbbyMSFT@users.noreply.github.com>

* Apply suggestion from @AbbyMSFT

* Apply suggestion from @AbbyMSFT

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Regan Downer <v-rdowner@microsoft.com>
* new onboarding

* updates

* updates

---------

Co-authored-by: Regan Downer <v-rdowner@microsoft.com>
…t8a-mberdugo) (#8077)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 4

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Remove AIRA-duplicated ai-usage metadata

Removed 'ai-usage' line from the document header.

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Auto Publish – main to live - 2026-06-24 22:33 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 5cc7651:

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

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

ShawnKupfer and others added 2 commits July 8, 2026 16:10
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit a847ca7:

❌ 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 a847ca757e93f7ecf5addf5b7da67614d8a334b9 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit 9c04d57dba1a52ef7eeaa64088a9b997e93d7a25). 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: Derrick Lee <derricklee@microsoft.com>
chrisda
chrisda previously approved these changes Jul 8, 2026
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit dfc85f6:

💡 Validation status: suggestions

File Status Preview URL Details
defender-office-365/media/configure-unified-rbac-defender-office-365-security-operations-details-flyout.png 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-considerations.md 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-faq.md 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-overview.md 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-prerequisites.md 💡Suggestion Details
.github/copilot-instructions.md ✅Succeeded
.openpublishing.redirection.defender-business.json ✅Succeeded
.openpublishing.redirection.defender-cloud-apps.json ✅Succeeded
.openpublishing.redirection.defender-endpoint.json ✅Succeeded
.openpublishing.redirection.defender-for-cloud.json ✅Succeeded
.openpublishing.redirection.defender-xdr.json ✅Succeeded
.openpublishing.redirection.sentinel.json ✅Succeeded
authorized-approvers.txt ✅Succeeded
defender-business/get-defender-business.md ✅Succeeded
defender-business/mdb-asr.md ✅Succeeded
defender-business/mdb-configure-security-settings.md ✅Succeeded
defender-business/mdb-controlled-folder-access.md ✅Succeeded n/a (file deleted or renamed)
defender-business/mdb-faq.yml ✅Succeeded
defender-business/mdb-next-generation-protection.md ✅Succeeded
defender-business/mdb-reports.md ✅Succeeded
defender-business/mdb-view-edit-create-policies.md ✅Succeeded
defender-business/mdb-web-content-filtering.md ✅Succeeded
defender-business/mdb-whats-new.md ✅Succeeded
defender-business/TOC.yml ✅Succeeded
defender-endpoint/address-unwanted-behaviors-mde.md ✅Succeeded

This comment lists only the first 25 files in the pull request.

defender-office-365/media/configure-unified-rbac-defender-office-365-security-operations-details-flyout.png

  • Line 0, Column 0: [Suggestion: image-name-incomplete - See documentation] The image name contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-considerations.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-faq.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-overview.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-prerequisites.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

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

Copy link
Copy Markdown
Contributor

PRMerger Results

Issue Description
Added File(s) This PR contains added files. New files require human review.
Deleted File(s) This PR deletes Markdown or YAML files owned by another author, or json file(s). The pull request must contain a comment from the pull request author confirming that all the file deletions are intentional before the pull request can be merged.
Yaml File(s) This PR includes changes to .yml file(s) owned by another author.
Changed Files This PR contains more than 10 changed files.
Commits Count This PR contains more than 15 commits.
File Change Percent This PR contains file(s) with more than 30% file change.
Unapproved file extension(s) This PR contains file types that are not supported in the repo. The only supported file types are jpg, gif, png, json, svg and md.
GDPR Content(s) PR references GDPR and must be human reviewed to ensure appropriate guidelines are followed.
Image File This PR added or updated an image file(s).
Json File This PR contains json file(s).
Repository root file This pull request contains a file submitted to the root of the repository.

Auto Publish – main to live - 2026-07-09 07:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 49fc79d:

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

Adipkmic and others added 6 commits July 9, 2026 09:22
…g #8447 (#8591)

* Add session start workflow to copilot instructions

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

* Revert "Add session start workflow to copilot instructions"

This reverts commit c138e4f61d733760b1887e526e2f6d485ab25bcd.

* Add session start workflow to copilot instructions

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

* Revert "Add session start workflow to copilot instructions"

This reverts commit c138e4f61d733760b1887e526e2f6d485ab25bcd.

* Add SaaS app support to Password protection page (work item 584112)

- Add SaaS apps (via Defender for Cloud Apps SSPM) as a supported source on the Password Hygiene and Password Policies tabs
- Add Defender for Cloud Apps license and app connector prerequisite
- Broaden intro to mention SaaS apps
- Add July 2026 what's new entry
- Update ms.date

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

* Apply suggestion from @AbbyMSFT

---------

Co-authored-by: AbbyMSFT <88824859+AbbyMSFT@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Sophia Nikolayev <v-snikolayev@microsoft.com>
Enhance getfile operation documentation
Auto Publish – main to live - 2026-07-09 12:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 0e3a1bb:

❌ 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 0e3a1bb91e703f42faade1377843e767b3023c49 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit 937fb33f0e0263fc2ecc65abe2fd772152b3539c). 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 July 9, 2026 14:16
Auto Publish – main to live - 2026-07-09 17:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit d661ce1:

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

ShawnKupfer and others added 3 commits July 9, 2026 13:30
… PR#275 (#8630)

* User Story 593173: Clean up legacy defender-docs public repo PRs - OG PR#275

* Fix link
E3 gets MDO P1 + prompt injection protection
Auto Publish – main to live - 2026-07-09 22:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 2de16cf:

❌ 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 2de16cf8ac4c7a9eea602d58dc878dc98f8822c1 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit 937fb33f0e0263fc2ecc65abe2fd772152b3539c). 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 7747e7c:

💡 Validation status: suggestions

File Status Preview URL Details
defender-office-365/media/configure-unified-rbac-defender-office-365-security-operations-details-flyout.png 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-considerations.md 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-faq.md 💡Suggestion Details
defender-xdr/defender-experts/defender-experts-mdr-overview.md 💡Suggestion Details
.github/copilot-instructions.md ✅Succeeded
.openpublishing.redirection.defender-business.json ✅Succeeded
.openpublishing.redirection.defender-cloud-apps.json ✅Succeeded
.openpublishing.redirection.defender-endpoint.json ✅Succeeded
.openpublishing.redirection.defender-for-cloud.json ✅Succeeded
.openpublishing.redirection.defender-xdr.json ✅Succeeded
.openpublishing.redirection.sentinel.json ✅Succeeded
authorized-approvers.txt ✅Succeeded
defender-business/get-defender-business.md ✅Succeeded
defender-business/mdb-asr.md ✅Succeeded
defender-business/mdb-configure-security-settings.md ✅Succeeded
defender-business/mdb-controlled-folder-access.md ✅Succeeded n/a (file deleted or renamed)
defender-business/mdb-faq.yml ✅Succeeded
defender-business/mdb-next-generation-protection.md ✅Succeeded
defender-business/mdb-reports.md ✅Succeeded
defender-business/mdb-view-edit-create-policies.md ✅Succeeded
defender-business/mdb-web-content-filtering.md ✅Succeeded
defender-business/mdb-whats-new.md ✅Succeeded
defender-business/TOC.yml ✅Succeeded
defender-endpoint/address-unwanted-behaviors-mde.md ✅Succeeded
defender-endpoint/ai-agent-runtime-protection-overview.md ✅Succeeded

This comment lists only the first 25 files in the pull request.

defender-office-365/media/configure-unified-rbac-defender-office-365-security-operations-details-flyout.png

  • Line 0, Column 0: [Suggestion: image-name-incomplete - See documentation] The image name contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-considerations.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-faq.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

defender-xdr/defender-experts/defender-experts-mdr-overview.md

  • Line 0, Column 0: [Suggestion: filename-incomplete - See documentation] The filename contains an incomplete word, misspelled word, acronym, or abbreviation that is disallowed.

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

Copy link
Copy Markdown
Contributor

PRMerger Results

Issue Description
Added File(s) This PR contains added files. New files require human review.
Deleted File(s) This PR deletes Markdown or YAML files owned by another author, or json file(s). The pull request must contain a comment from the pull request author confirming that all the file deletions are intentional before the pull request can be merged.
Yaml File(s) This PR includes changes to .yml file(s) owned by another author.
Changed Files This PR contains more than 10 changed files.
Commits Count This PR contains more than 15 commits.
File Change Percent This PR contains file(s) with more than 30% file change.
Unapproved file extension(s) This PR contains file types that are not supported in the repo. The only supported file types are jpg, gif, png, json, svg and md.
GDPR Content(s) PR references GDPR and must be human reviewed to ensure appropriate guidelines are followed.
Image File This PR added or updated an image file(s).
Json File This PR contains json file(s).
Repository root file This pull request contains a file submitted to the root of the repository.

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 needs-human-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.