Resolve syncing conflicts from repo_sync_working_branch to main by learn-build-service-prod[bot] · Pull Request #8094 · MicrosoftDocs/windowsserverdocs

learn-build-service-prod · 2025-10-22T17:33:55Z

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

Co-authored-by: robinharwood <19212983+robinharwood@users.noreply.github.com>

update redirection

….1 features and improvements

…racy

… Hyper-V

…setid-from-metadata [Scoped] Remove manager and ms.assetid from YAML metadata

Metadata clean up

…ge-aa-mo-2 [Scoped] Ref Author updates part 2

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

Auto Publish – main to live - 2025-10-23 17:30 UTC

learn-build-service-prod · 2025-10-23T17:36:12Z

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.

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 · 2025-10-24T17:39:07Z

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.

…-local Hyper-V fix context for Azure Local

Auto Publish – main to live - 2025-10-27 17:30 UTC

learn-build-service-prod · 2025-10-27T17:35:54Z

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.

…-links Restore previous versions content and remove previous versions links

Hyper-V rename QoS

Auto Publish – main to live - 2025-10-28 17:30 UTC

learn-build-service-prod · 2025-10-28T17:38:28Z

Learn Build status updates of commit 2e23c7f:

❌ 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 2e23c7f3ad3c4c67282794f2095f920c2dc36ce5 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.

Hyper-V fix TOC structure

Auto Publish – main to live - 2025-10-28 22:30 UTC

learn-build-service-prod · 2025-10-28T22:34:28Z

Learn Build status updates of commit 926265c:

❌ 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 926265c65d08cc12f6fd817604a14f63ac1499aa 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 · 2025-10-30T15:55:34Z

Learn Build status updates of commit af5a803:

✅ Validation status: passed

File	Status	Preview URL	Details
.openpublishing.redirection.json	✅Succeeded
WindowsServerDocs/administration/windows-commands/active.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/add_2.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/add-alias.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/add-volume.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/add.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/adprep.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/append.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/arp.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/assign.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/assoc.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/at.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/atmadm.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/attach-vdisk.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/attrib.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/attributes-disk.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/attributes-volume.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/attributes.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-backup.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-clear.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-get.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-list.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-remove.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-resourcesacl.md	✅Succeeded
WindowsServerDocs/administration/windows-commands/auditpol-restore.md	✅Succeeded

This comment lists only the first 25 files in the pull request.
For more details, please refer to the build report.

prmerger-automator · 2025-10-30T15:55:51Z

PRMerger Results

Issue	Description
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.
Json File	This PR contains json file(s).

robinharwood and others added 30 commits September 22, 2023 17:37

Initial WIP

8d9056c

Completed the new article configure-live-migration-smb-bandwidth.md

c2c9d19

Added to TOC

9ed3a91

Acrolinx pass

62fc3bf

Updated new article and added equalation images

968fa35

Fixing broken link

fbc818d

Edit pass

407882a

Edit pass

d0b3de2

Formatting fix

aa2720d

Resolving merge conflict

0ea820e

Updating title

5367610

Initial plan

0920d6a

Remove ms.assetid from YAML metadata in WindowsServerDocs

b71293d

Co-authored-by: robinharwood <19212983+robinharwood@users.noreply.github.com>

[DocsArchive-1.0.25268.1](2025-10-15-17-09-33)Auto archive content

4decb8e

update redirection

effc056

Merge pull request #6 from huypub/correct-redirection

318fc5f

update redirection

Update migration documentation for VMware to Hyper-V: add version 1.8…

1bc4514

….1 features and improvements

Update link to migration documentation for VMware to Hyper-V for accu…

12e4510

…racy

Update link for quick access to migration documentation for VMware to…

7551eef

… Hyper-V

Remove OctRelease subproject reference

53d0c62

Merge pull request #7577 from MicrosoftDocs/copilot/remove-manager-as…

c7a8e0c

…setid-from-metadata [Scoped] Remove manager and ms.assetid from YAML metadata

Metadata clean up

c07c4fe

Fixing encoding artifacts

2a66a71

[Scoped] Ref Author updates part 2

4282dd4

Fixing more encoding issues

91fa37e

Fixing encoding issue

70a117f

Merge pull request #7602 from robinharwood/robinharwood-metadata-cleanup

8bede79

Metadata clean up

Merge pull request #7603 from robinharwood/robinharwood-msauthor-chan…

052ab20

…ge-aa-mo-2 [Scoped] Ref Author updates part 2

[Scoped] Ref Author updates part 1

11e81f7

Update WindowsServerDocs/administration/windows-commands/netsh-wcn.md

f6b8b64

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

robinharwood and others added 4 commits October 23, 2025 16:20

Updates after feedback and final editorial pass

9318146

Minor title edit

fade264

Updated applies to for Live Migration article

a120ed4

Merge pull request #7610 from MicrosoftDocs/main

d341900

Auto Publish – main to live - 2025-10-23 17:30 UTC

robinharwood and others added 4 commits October 24, 2025 09:54

Updated alt text after feedback

00ccdf6

Merge pull request #4315 from robinharwood/roharwoo_smb_bandwidth_limit

977543d

New article: Configure cluster-wide Live Migration SMB bandwidth control

Merge pull request #7592 from huypub/Release_Archive_main_2025-10-15-…

87d468e

…17-09-33 [DocsArchive-1.0.25268.1](2025-10-15-17-09-33)Auto archive content

Merge pull request #7612 from MicrosoftDocs/main

a64f4a7

Auto Publish – main to live - 2025-10-24 17:30 UTC

dknappettmsft and others added 3 commits October 27, 2025 15:18

Hyper-V fix context for Azure Local

0314ad5

Merge pull request #7614 from dknappettmsft/hyper-v-fix-context-azure…

ad9efa3

…-local Hyper-V fix context for Azure Local

Merge pull request #7615 from MicrosoftDocs/main

b9f4318

Auto Publish – main to live - 2025-10-27 17:30 UTC

dknappettmsft and others added 6 commits October 28, 2025 14:52

Restore previous versions content

b1471a2

Merge pull request #7616 from dknappettmsft/hyper-v-previous-versions…

23ecfc3

…-links Restore previous versions content and remove previous versions links

Hyper-V rename QoS

5d79c3d

Merge pull request #7617 from dknappettmsft/hyper-v-network-qos

d0d5b43

Hyper-V rename QoS

Hyper-V fix TOC structure

bf758f9

Merge pull request #7618 from MicrosoftDocs/main

2e23c7f

Auto Publish – main to live - 2025-10-28 17:30 UTC

Merge pull request #7619 from dknappettmsft/hyper-v-toc-fix

374afb7

Hyper-V fix TOC structure

v-dirichards requested a review from robinharwood October 28, 2025 20:09

Merge pull request #7620 from MicrosoftDocs/main

926265c

Auto Publish – main to live - 2025-10-28 22:30 UTC

Merge branch 'main' into repo_sync_working_branch

af5a803

prmerger-automator Bot added the needs-human-review label Oct 30, 2025

robinharwood merged commit cfbdc5b into main Oct 30, 2025
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Resolve syncing conflicts from repo_sync_working_branch to main - #8094

Resolve syncing conflicts from repo_sync_working_branch to main#8094
robinharwood merged 60 commits into
mainfrom
repo_sync_working_branch

learn-build-service-prod Bot commented Oct 22, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 23, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 24, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 27, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 28, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 28, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 30, 2025

Uh oh!

prmerger-automator Bot commented Oct 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Conversation

learn-build-service-prod Bot commented Oct 22, 2025

Uh oh!

learn-build-service-prod Bot commented Oct 23, 2025

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Oct 24, 2025

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Oct 27, 2025

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Oct 28, 2025

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Oct 28, 2025

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Oct 30, 2025

✅ Validation status: passed

Uh oh!

prmerger-automator Bot commented Oct 30, 2025

PRMerger Results

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants