Resolve syncing conflicts from repo_sync_working_branch to main - #14403
Merged
Conversation
…s://github.com/MicrosoftDocs/azure-devops-docs (branch main) (#9699) * Merge main > LIVE (#9663) * MDP: Update network validation script * Update docs/managed-devops-pools/configure-networking.md Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> * Update script to handle http Urls * Updated PowerShell script * Update script note * Apply suggestions from code review Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com> * Add endpoint to the script * Update * ELM public preview (#9661) * audit updates * elm public preview * default enabled * Update docs/organizations/audit/auditing-streaming.md Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> * Update auditing-streaming.md --------- Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> Co-authored-by: James Barnett <v-jabarnett@microsoft.com> * Update script * Apply batched suggestions from code review Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com> * Add anchor links * Update script --------- Co-authored-by: Steve Danielson <Steve.Danielson@microsoft.com> Co-authored-by: Steve Danielson <steved0x@github.com> Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com> Co-authored-by: James Barnett <v-jabarnett@microsoft.com> Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com> Co-authored-by: prmerger-automator[bot] <40007230+prmerger-automator[bot]@users.noreply.github.com> * Document `AZP_AGENT_DEFAULT_MAP_DOCKER_SOCKET_TO_FALSE` @ container proc (#14402) * Document `AZP_AGENT_DEFAULT_MAP_DOCKER_SOCKET_TO_FALSE` @ container proc This is useful short-term for mass-deployments when it's impractical and unrealistic to make large changes on suddenly-updated agents. This env var toggle has been added in the same PR microsoft/azure-pipelines-agent#5627, but it looks that the docs writers had forgotten to record this change for better discovery. * Update Docker socket mapping instructions in documentation Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update Docker socket mapping explanation in documentation Clarified the behavior of the agent host environment variable regarding Docker socket mapping in container jobs. --------- Co-authored-by: chcomley <35748196+chcomley@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Update docs/pipelines/process/container-phases.md Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@users.noreply.github.com> --------- Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com> Co-authored-by: chcomley <35748196+chcomley@users.noreply.github.com> Co-authored-by: Steve Danielson <Steve.Danielson@microsoft.com> Co-authored-by: Steve Danielson <steved0x@github.com> Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com> Co-authored-by: learn-build-service-prod-04[bot] <274428985+learn-build-service-prod-04[bot]@users.noreply.github.com> Co-authored-by: James Barnett <v-jabarnett@microsoft.com> Co-authored-by: learn-build-service-prod-02[bot] <274428175+learn-build-service-prod-02[bot]@users.noreply.github.com> Co-authored-by: prmerger-automator[bot] <40007230+prmerger-automator[bot]@users.noreply.github.com> Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com> Co-authored-by: Hector <v-ndat@microsoft.com> Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@users.noreply.github.com>
Auto Publish – main to live - 2026-09-10 13:00 UTC
Contributor
|
@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change. |
Contributor
|
@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change. |
Contributor
|
Copilot resolve the merge conflicts in this pull request |
1 similar comment
Contributor
|
Copilot resolve the merge conflicts in this pull request |
Copilot started work on behalf of
Regan Downer (v-regandowner)
September 10, 2026 14:18
View session
# Conflicts: # docs/pipelines/process/container-phases.md Co-authored-by: v-regandowner <97987445+v-regandowner@users.noreply.github.com>
Contributor
Copilot started work on behalf of
Regan Downer (v-regandowner)
September 10, 2026 14:24
View session
Copilot stopped work on behalf of
Regan Downer (v-regandowner) due to an error
September 10, 2026 14:25
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to main.