Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public - #545

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

snicklezzz and others added 30 commits July 16, 2026 10:34
…d-individual-1784131387

Update transition-grouped-individual-recommendations.md
…onnector-1784130580

Update create-github-connector.md
…onnector-1784190050

Update create-github-connector.md
DeviceCustomFileEvents and DeviceCustomRegistryEvents are new addition to the benefit for FIM over Custom Data Collection in Defender Portal
Auto Publish – main to live - 2026-07-16 12:30 UTC
… (#8712)

Copilot-Session: 0c0dc332-72d8-44b7-ba71-ff260cf5ebaa

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-07-16 17:30 UTC
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>
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>
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>
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>
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>
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>
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>
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>
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>
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: Chris Davis <chris.davis@microsoft.com>
Remediation for COPY-EDIT.
Files affected: 7

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>
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>
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>
* Learn Editor: Update controlled-folder-access-configure.md

* Learn Editor: Update controlled-folder-access-configure.md
* Learn Editor: Update controlled-folder-access-overview.md

* Learn Editor: Update controlled-folder-access-overview.md

* Clean up formatting in controlled folder access overview

Removed redundant blank lines and cleaned up formatting in the CFA overview document.

* Simplify CFA requirements by removing redundant modes

Removed redundant list of modes where CFA does not work.

* Update note on controlled folder access locations

Clarified note about default protected folders and OneDrive integration.

* Fix formatting in controlled-folder-access-overview.md

* Clarify CFA mode requirements for Microsoft Defender

---------

Co-authored-by: Chris Davis <chris.davis@microsoft.com>
zeinab-mk and others added 7 commits July 30, 2026 08:55
Added information about the impact of deleting source workspaces on scheduled KQL jobs and their automatic disabling.
Removing the vendor-specific steps and retaining only the generic guidance, which should be more helpful and easier for customers to follow.
Adding detailed instructions because pressing the Enter key is currently a required step in the user experience. The PM team plans to redesign this experience in a future update.
* Learn Editor: Update ai-onboarding.md

* Update defender-for-cloud/ai-onboarding.md

* Update date and heading in AI onboarding documentation

Fixed missing paren

* Fix heading formatting for Data Security section

* Fix link text for data security in AI interactions

PM removed Foundry in subheading in linked article so fixing the anchor

* Fix link formatting of Data security section in onboarding doc

---------

Co-authored-by: Celeste de Guzman <16906646+CelesteDG@users.noreply.github.com>
* Learn Editor: Update alerts-xdr.md

* Learn Editor: Update alerts-xdr.md
* Update submissions-report-messages-files-to-microsoft.md

Addid new video link per email request.

* Build report fixes

* Update connector-details.md

Fixes per build report
Auto Publish – main to live - 2026-07-30 17:30 UTC
@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.

himanch and others added 21 commits July 30, 2026 11:12
… (#8878)

* Expand cloud identity security assessments

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cb573c39-2875-48a5-90f2-553e85bf4afe

* Copy edit cloud identity assessments

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

Copilot-Session: 6320c45d-0255-4b4b-aaf5-1d1da9455606

---------

Co-authored-by: Himanshu Chawla <himchawla@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Chris Davis <chris.davis@microsoft.com>
Copilot-Session: cb573c39-2875-48a5-90f2-553e85bf4afe
Copilot-Session: 6320c45d-0255-4b4b-aaf5-1d1da9455606
* Update submissions-report-messages-files-to-microsoft.md

Addid new video link per email request.

* Build report fixes

* Update connector-details.md

Fixes per build report

* Build report fixes

* Update attack-simulation-training-faq.md

Updates per content VSO 601638
* SCC

* Update secure-controlled-configuration.md

Copy and technical edits

* Update secure-controlled-configuration.md

Updates per TR

* Update secure-controlled-configuration.md

* More updates per TR

* Controlled config info into ASR rules articles

* Update secure-controlled-configuration.md

Added minimum client version and rollback
…on-setup-1785438645

Update data-federation-setup.md
Auto Publish – main to live - 2026-07-30 22:33 UTC
@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.

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.