Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#514

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

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

Conversation

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

@learn-build-service-prod learn-build-service-prod Bot commented May 27, 2026

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

poliveria and others added 30 commits May 25, 2026 12:14
@poliveria
Update CloudProcessEvents schema and date
a6a81eb 
Bump ms.date to 05/30/2026 and add new columns to the CloudProcessEvents reference: ImageDigest, AgentId, Region, and HostName. Also reorder AdditionalFields to the end. These additions surface container image digest, sensor/agent identifier, cluster region, and node hostname for advanced hunting queries.
@poliveria
Update advanced hunting tables in documentation
a05c63e
@poliveria
Merge branch 'main' into poliveria-patch-1
501c794
@EdB-MSFT
Merge branch 'main' into update-docfx-rules
114ca7b
@paulinbar
Pen testing
49356aa
@EdB-MSFT
Add sentinel-tables-connectors to exclude list
9ddc223
@paulinbar
Formatted json code block
0061fd7
@paulinbar
Misc formatting
13428e1
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
6a39235 
 into painbar-linux-eval-guidance
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
a47648f 
 into painbar-linux-eval-guidance
@paulinbar
Remove preview labels from Defender deployment tool (Windows) and leg…
547512d 
…acy endpoint security solution

Update documentation to reflect GA status for:
- Defender deployment tool for Windows devices
- Defender endpoint security solution for Windows 7 SP1 and Windows Server 2008 R2 SP1

Removes (preview) tags from titles, headings, link text, and body
references across 7 files in the defender-endpoint folder.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
c1c5d01 
 into painbar-ddt-GA-update
@paulinbar
Misc updates
9f5c777
@paulinbar
Misc updates
e62713d
@paulinbar
Misc changes
d0ba72f
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
f4cc15f 
 into painbar-ddt-GA-update
@paulinbar
Update whats-new-in-microsoft-defender-endpoint.md
131296e
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
4ff3980 
 into painbar-ddt-GA-update
@paulinbar
Merge branch 'painbar-ddt-GA-update' of https://github.com/paulinbar/…
b2c2360 
…defender-docs-pr into painbar-ddt-GA-update
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
2aedbf6 
 into painbar-linux-eval-guidance
@paulinbar
Added GA method
8b17c29
@paulinbar
Misc changes
0310e50
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
1294589 
 into painbar-ddt-GA-update
@paulinbar
added reviewer
054ed50
@paulinbar
Misc changes
c160263
@paulinbar
Made formatting more consistent
75dd78b
@AbbyMSFT
Remove Extended RPC Audit (Preview) content from MDI docs
13572e6 
Remove the Extended Sensor Audit (Preview) feature references:
- Remove 'Extended RPC auditing capabilities (Preview)' section from What's New
- Remove 'Extended Sensor Audit' tag option from deploy-sensor-v3.md procedure
- Remove 'Sensor v3.x Extended RPC Audit Misconfigured (Preview)' health alert

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@paulinbar
Corrected offboarding note
042137d
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
925087d 
 into painbar-ddt-GA-update
@paulinbar
Reordered tabs
1a80f57
chrisda and others added 5 commits May 29, 2026 15:54
@chrisda
Merge branch 'main' into chrisda
e588742
@chrisda
Merge pull request #7826 from chrisda/chrisda
621cdb4 
Update scc-permissions.md
@chrisda
Update scc-permissions.md
08cda3e 
Further updates per content VSO 553252
@chrisda
Merge pull request #7827 from chrisda/chrisda
2e8fbef 
Update scc-permissions.md
@learn-build-service-prod
Merge pull request #7828 from MicrosoftDocs/main
16c5946 
Auto Publish – main to live - 2026-05-30 07:30 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

learn-build-service-prod Bot commented May 30, 2026

Learn Build status updates of commit 16c5946:

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

paulinbar and others added 3 commits May 30, 2026 15:38
@paulinbar
Merge branch 'main' of https://github.com/MicrosoftDocs/defender-docs-pr
cb609c7 
 into painbar-android-ios-network-protection-settings-update
@paulinbar
Merge pull request #7715 from paulinbar/painbar-android-ios-network-p…
25194a5 
…rotection-settings-update

Painbar android ios network protection settings update
@learn-build-service-prod
Merge pull request #7829 from MicrosoftDocs/main
76dc7f8 
Auto Publish – main to live - 2026-05-30 17:30 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

learn-build-service-prod Bot commented May 30, 2026

Learn Build status updates of commit 76dc7f8:

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

guywi-ms and others added 15 commits May 31, 2026 11:18
@guywi-ms
Merge pull request #7790 from guywi-ms/s4ai-threat-hunting-preview
cf6c19f 
Add prerequisite: enable preview features for AIAgentsInfo table and Agent entity
@EdB-MSFT
Fix grammar in service limits documentation
7d37c1c
@EdB-MSFT
Fix formatting in service-limits-kql-jobs.md
ee695b0
@EdB-MSFT
Update note on request rejection for limits
2ceb8bf 
Clarified the rejection behavior of rate and concurrency limits.
@EdB-MSFT
[AUTOGEN] PR for Sentinel connectors
367fc47
@guywi-ms
Merge pull request #7733 from poliveria/poliveria-ah-cloudevents-0525…
6d9a6e7 
…2026

Update CloudProcessEvents schema and date
@guywi-ms
Merge pull request #7697 from MicrosoftDocs/poliveria-patch-1
3700ca1 
Update advanced-hunting-security-copilot.md
@EdB-MSFT
Merge pull request #7797 from zeinab-mk/docs/sentinel-datalake-thrott…
d04ff22 
…ling-limits-20260528

docs(sentinel-datalake): update KQL queries and jobs throttling limits
@shsagir
Rename the automation
254b694
@shsagir
Test
50c17da
@guywi-ms
Fix prereqs wording in AI agent articles
dfa4613 
Reword prerequisites to action-first pattern and fix hyphenation
(AI agent-related evidence).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@guywi-ms
Merge branch 'main' into a365-updates-v2
d3e8a6c
@shsagir
Updates
5322438
@guywi-ms
Merge pull request #7833 from guywi-ms/a365-updates-v2
8dece8d 
Fix prereqs wording in AI agent articles
@learn-build-service-prod
Merge pull request #7834 from MicrosoftDocs/main
a9d0185 
Auto Publish – main to live - 2026-05-31 12:30 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

learn-build-service-prod Bot commented May 31, 2026

Learn Build status updates of commit a9d0185:

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

JillGrant615 and others added 3 commits May 31, 2026 15:29
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

learn-build-service-prod Bot commented May 31, 2026

Learn Build status updates of commit fe3d945:

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

Reviewers

No reviews

Assignees

No one assigned

Labels

Change sent to author do-not-merge microsoft-defender/svc unified-security-operations/subsvc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.