Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#502

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

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

EdB-MSFT and others added 6 commits May 6, 2026 15:42
Updated data lake query and advanced data insights charges descriptions.
Revise billing details for data lake services
Update Azure Government availability for Analytics rules
Auto Publish – main to live - 2026-05-06 17:36 UTC
@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 9ef8cfc:

❌ 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 9ef8cfc9ef1c5c53803eb50f52d77cbfb504ef06 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit e8a91d1b3c934e3a00cce0a21ddd2959601f4c10). 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 May 6, 2026 13:14
- Rename m365-cc-sc-*.png to defender-portal-icon-*.png pattern
- Add new defender-portal-icon PNG files (close, create, filter, etc.)
- Update image references in admin-submissions-mde.md, device-control-report.md, machines-view-overview.md
- Update device-control-faq.md, edr-block-mode-faqs.yml, evaluate-mda-using-mde-security-settings-management.md

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Rename media icons and update 6 non-ASR articles
Auto Publish – main to live - 2026-05-06 22:37 UTC
@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 2e84428:

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

3 participants