Skip to content

Conversation

@learn-build-service-prod
Copy link
Contributor

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

robinharwood and others added 30 commits September 22, 2023 17:37
Co-authored-by: robinharwood <19212983+robinharwood@users.noreply.github.com>
…setid-from-metadata

[Scoped] Remove manager and ms.assetid from YAML metadata
…ge-aa-mo-2

[Scoped] Ref Author updates part 2
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@v-dirichards
Copy link
Contributor

@robinharwood, @Xelu86
Can you review the proposed changes?

#label:"aq-pr-triaged"
@MicrosoftDocs/public-repo-pr-review-team
#assign: @robinharwood, @Xelu86

@v-dirichards v-dirichards requested a review from Copilot October 22, 2025 20:23
@prmerger-automator prmerger-automator bot added the aq-pr-triaged tracking label for the PR review team label Oct 22, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request resolves syncing conflicts between the repo_sync_working_branch and main branches by removing deprecated metadata fields and updating author information across Windows Server documentation files.

Key Changes:

  • Removal of deprecated metadata fields (manager, ms.assetid, assetId)
  • Updates to author and contributor metadata (author, ms.author)
  • Minor documentation formatting corrections (punctuation, character encoding, spacing)

Reviewed Changes

Copilot reviewed 267 out of 267 changed files in this pull request and generated 1 comment.

File Description
Multiple .yml and .md files Removed deprecated manager and ms.assetid/assetId metadata fields from YAML frontmatter
Multiple command reference files Updated author attribution from xelu86/meaghanlewis to robinharwood/dknappettmsft and corresponding Microsoft aliases
Various .md files Minor formatting corrections including punctuation changes, character encoding fixes (× to x, em-dash corrections), and spacing adjustments
Comments suppressed due to low confidence (1)

WindowsServerDocs/administration/windows-commands/dcpromo.md:1

  • Corrected en-dash from '—and' to 'and' in 'server—and you'.
---

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@@ -1,6 +1,6 @@
---
---
Copy link

Copilot AI Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file contains a BOM (Byte Order Mark) character at the start. While not necessarily harmful, BOMs in UTF-8 files are generally unnecessary and can cause issues with some tools.

Suggested change
---
---

Copilot uses AI. Check for mistakes.
Auto Publish – main to live - 2025-10-22 22:30 UTC
@learn-build-service-prod
Copy link
Contributor Author

Learn Build status updates of commit ad1cbc2:

❌ 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 ad1cbc21fe788147cbfa6a275d5186e906ef79e1 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit d533d458d59610d3cafbcefc1e4f62576e5c3266). 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
Contributor Author

Learn Build status updates of commit d341900:

❌ 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 d34190029fd9c2f9085e19ee1d3af0724367b291 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit d533d458d59610d3cafbcefc1e4f62576e5c3266). 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.

robinharwood and others added 4 commits October 24, 2025 09:54
New article: Configure cluster-wide Live Migration SMB bandwidth control
…17-09-33

[DocsArchive-1.0.25268.1](2025-10-15-17-09-33)Auto archive content
Auto Publish – main to live - 2025-10-24 17:30 UTC
@learn-build-service-prod
Copy link
Contributor Author

Learn Build status updates of commit a64f4a7:

❌ 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 a64f4a7440a077b3fa2d893b1f188fa84e17fc8d in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit d533d458d59610d3cafbcefc1e4f62576e5c3266). 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.

dknappettmsft and others added 3 commits October 27, 2025 15:18
@learn-build-service-prod
Copy link
Contributor Author

Learn Build status updates of commit b9f4318:

❌ 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 b9f43180f8593c3420080f74e98c7c8053c23c21 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit d533d458d59610d3cafbcefc1e4f62576e5c3266). 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

Labels

aq-pr-triaged tracking label for the PR review team do-not-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.