Resolve syncing conflicts from from-prod-staging to staging #111

openpublishbuild · 2021-05-21T15:30:20Z

Pull request opened by Docs to resolve syncing conflicts from from-prod-staging to staging.

1/25 PM Publish

…ftDocs#7178) * Automatically committed changes. * Udates for PR

* Automatically committed changes. * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> * Update ConvertTo-Json.md Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

…icrosoftDocs#7177) * Updates for information about ParameterVariable parameter and updates formatting for common-parameter-names * Updates for PR * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> * Updates for feedback * Automatically committed changes. * Revert "Automatically committed changes." This reverts commit 73708f7. * Updates for PR Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

* Automatically committed changes. * Updates to fix build and to fix casing in headers * Updates for PR * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

…tDocs#7186)

1/26 PM Publish

1/28 PM Publish

* Automatically committed changes. * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

1/29 PM Publish

2/01 PM Publish

* Update monthly stats * Update TOC

…7204)

…Docs#7206) * Fixes MicrosoftDocs#7205 - Add warning about using SetSeed - Apply suggestions from code review * Apply suggestions from code review Co-authored-by: Steve Lee <slee@microsoft.com> * feedback * More feedback Co-authored-by: Steve Lee <slee@microsoft.com>

2/02 PM Publish

* Convert FAQ to YAML format * Fix xref errors * update TOC

2/03 PM Publish

Content Improvement in Exit-PSSession.md

See MicrosoftDocs#7180

2/08 PM Publish

…tDocs#7221) * Automatically committed changes. * Update reference/5.1/Microsoft.PowerShell.Core/About/about_Special_Characters.md Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> * updates for pr * Updates to place across versions Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

2/09 PM Publish

…Docs#7613) There are two issues with the last script: 1. { $_.ProcessId -eq $_.ProcessId } is always true. 2. Without "Format-List -Property *", the script does not show the DecodedCommand property.

* M50834 - Fixing Typo (MicrosoftDocs#6192) Translator has reported possible source content issue. Affected Line: 662 Description: "operation" should be "operator" * Publish to live (MicrosoftDocs#6256) * Updates formatting for DSC resource authoring section (MicrosoftDocs#6254) * Update formatting for resources folder * Updates dates metadata * Updates for formatting * Fixes MicrosoftDocs#1208 - add ETS docs (MicrosoftDocs#6253) * Fixes MicrosoftDocs#1208 - add ETS docs * Feedback edits * fix TOC * fix typo in TOC * fix typo * formatting * Remove section that is no longer considered best practice (MicrosoftDocs#6255) Co-authored-by: Chase Wilson <31453523+chasewilson@users.noreply.github.com> * Publish to live (MicrosoftDocs#6660) * Fixes MicrosoftDocs#6644 - Updates Write-Verbose (MicrosoftDocs#6657) * Fixes DocFXv3 build warnings (MicrosoftDocs#6659) Co-authored-by: Sean Wheeler <sewhee@microsoft.com> * fix typo Co-authored-by: Chase Wilson <31453523+chasewilson@users.noreply.github.com> Co-authored-by: Sean Wheeler <sewhee@microsoft.com> * Fix to add TLS 1.2 not overwrite existing options The old version overwrites all the existing values including TLS 1.3 and anything that might be added in the future. This version just makes sure TLS 1.2 is available for use while not modifying any other existing values. Co-authored-by: huypub <38988242+huypub@users.noreply.github.com> Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> Co-authored-by: V-vafune <54362071+V-vafune@users.noreply.github.com> Co-authored-by: Chase Wilson <31453523+chasewilson@users.noreply.github.com> Co-authored-by: Sean Wheeler <sewhee@microsoft.com> Co-authored-by: Alma Jenks <v-alje@microsoft.com>

…#7606) * Fixes MicrosoftDocs#5500 - publish language spec * Fix typo

5/20 PM Publish

opse2esa · 2021-05-21T15:31:21Z

Docs Build status updates of commit 159531b:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T15:41:09Z

Docs Build status updates of commit b95d79e:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T15:47:55Z

Docs Build status updates of commit 41cc009:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T15:48:55Z

Docs Build status updates of commit 7674f0c:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T16:20:23Z

Docs Build status updates of commit 296cefb:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T19:30:55Z

Docs Build status updates of commit e84e6f7:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-21T20:05:47Z

Docs Build status updates of commit cf78848:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

* Add links to language spec * fix bookmarks * fix warning * add missing link

opse2esa · 2021-05-22T01:30:21Z

Docs Build status updates of commit de059ec:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-22T02:46:38Z

Docs Build status updates of commit 8b68e90:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-23T15:43:54Z

Docs Build status updates of commit 239ebea:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

* Outline draft * updates for saves * Updates Get-Item * removes extra file Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

opse2esa · 2021-05-25T00:57:36Z

Docs Build status updates of commit c46dd8f:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

opse2esa · 2021-05-25T22:29:32Z

Docs Build status updates of commit 458967d:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

[Error-PullRequestMergeConflict] Cannot sync git repo to specified state. Please make sure the pull request is mergeable.

For more details, please refer to the build report.

If you see build warnings/errors with permission issues, it might be due to single sign-on (SSO) enabled on Microsoft's GitHub organizations. Please follow instructions here to re-authorize your GitHub account to Docs Build.

Note: Broken links written as relative paths are included in the above build report. For broken links written as absolute paths or external URLs, see the broken link report.

Note: Your PR may contain errors or warnings 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.

For any questions, please:

Try searching the docs.microsoft.com contributor guides
Post your question in the Docs support channel

huypub and others added 30 commits January 25, 2021 15:05

Merge pull request MicrosoftDocs#7176 from MicrosoftDocs/staging

0f00364

1/25 PM Publish

Fixes MicrosoftDocs#7170 - Updates Import-PowerShellDataFile (Microso…

9efc947

…ftDocs#7178) * Automatically committed changes. * Udates for PR

Fixes MicrosoftDocs#7172 - Updates ConvertTo-Json (MicrosoftDocs#7179)

baa356d

* Automatically committed changes. * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> * Update ConvertTo-Json.md Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

Automatically committed changes. (MicrosoftDocs#7185)

8ffac04

Fixes MicrosoftDocs#7163 - remove EA parameter from example (Microsof…

cb45360

…tDocs#7186)

Merge pull request MicrosoftDocs#7187 from MicrosoftDocs/staging

11880ca

1/26 PM Publish

Fix AddScript code sample (MicrosoftDocs#7190)

0ac3dca

Merge pull request MicrosoftDocs#7193 from MicrosoftDocs/staging

880b002

1/28 PM Publish

Fixes MicrosoftDocs#7194 - Force overrides WhatIf (MicrosoftDocs#7197)

4ca8ef8

Fixes MicrosoftDocs#7189 - Updates Wait-Job (MicrosoftDocs#7192)

322f32a

* Automatically committed changes. * Apply suggestions from code review Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com> Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

Merge pull request MicrosoftDocs#7198 from MicrosoftDocs/staging

81558c2

1/29 PM Publish

Fix examples: Everything ... about PSCustomObject (MicrosoftDocs#7199)

1bb1ee3

Merge pull request MicrosoftDocs#7201 from MicrosoftDocs/staging

08c6309

2/01 PM Publish

Update monthly stats for January 2021 (MicrosoftDocs#7202)

bd26075

* Update monthly stats * Update TOC

Fixes MicrosoftDocs#7203 - fix link to latest release (MicrosoftDocs#…

7afa336

…7204)

Merge pull request MicrosoftDocs#7207 from MicrosoftDocs/staging

fa1a84c

2/02 PM Publish

Update links to releases

34579dc

Convert FAQ to new YAML format (MicrosoftDocs#7208)

a9c9bf4

* Convert FAQ to YAML format * Fix xref errors * update TOC

Merge pull request MicrosoftDocs#7209 from MicrosoftDocs/staging

40b6d8e

2/03 PM Publish

Fix inconsistent variable casing (MicrosoftDocs#7213)

9e7c908

Update Exit-PSSession.md (MicrosoftDocs#7217)

a9c6a61

Content Improvement in Exit-PSSession.md

Automatically committed changes. (MicrosoftDocs#7219)

cfb0442

New (fixed) Get-Date -UFormat %u behavior (MicrosoftDocs#7183)

010f4f5

See MicrosoftDocs#7180

Merge pull request MicrosoftDocs#7222 from MicrosoftDocs/staging

3a1d80e

2/08 PM Publish

Merge pull request MicrosoftDocs#7226 from MicrosoftDocs/staging

364c3fe

2/09 PM Publish

Fixes MicrosoftDocs#7225 - add keyboard shortcut (MicrosoftDocs#7227)

75dc931

ishimada and others added 7 commits May 20, 2021 15:21

Update Decode-PowerShell-Command-from-a-Running-Process.md (Microsoft…

b4a68e8

…Docs#7613) There are two issues with the last script: 1. { $_.ProcessId -eq $_.ProcessId } is always true. 2. Without "Format-List -Property *", the script does not show the DecodedCommand property.

[WIP] Fixes MicrosoftDocs#5500 - publish language spec (MicrosoftDocs…

37a18a3

…#7606) * Fixes MicrosoftDocs#5500 - publish language spec * Fix typo

Merge pull request MicrosoftDocs#7614 from MicrosoftDocs/staging

fe99d5e

5/20 PM Publish

add note and number TOC (MicrosoftDocs#7615)

5147c62

add note and number TOC (MicrosoftDocs#7615) (MicrosoftDocs#7616)

183bcd6

More formatting fixes for lang-spec (MicrosoftDocs#7617)

159531b

Fixes MicrosoftDocs#5837 - fix broken ref link (MicrosoftDocs#7618)

b95d79e

sdwheeler added 2 commits May 21, 2021 10:46

Fix TOC for lang-spec (MicrosoftDocs#7619)

41cc009

Merge branch 'live' into staging

7674f0c

Fixes MicrosoftDocs#7598 - remove WMI examples (MicrosoftDocs#7621)

296cefb

Fix chapter numbers (MicrosoftDocs#7623)

e84e6f7

Add section numbers (MicrosoftDocs#7624)

cf78848

Add links to language spec (MicrosoftDocs#7626)

de059ec

* Add links to language spec * fix bookmarks * fix warning * add missing link

Fix links to cmdlets (MicrosoftDocs#7628)

8b68e90

Fixes MicrosoftDocs#7630 - fix example 6 (MicrosoftDocs#7631)

239ebea

Updates Get-Item (MicrosoftDocs#7637)

c46dd8f

* Outline draft * updates for saves * Updates Get-Item * removes extra file Co-authored-by: Sean Wheeler <sean.wheeler@microsoft.com>

Updated quick filter for azps to version 6.0.0 (MicrosoftDocs#7641)

458967d

Resolve syncing conflicts from from-prod-staging to staging #111

Are you sure you want to change the base?

Resolve syncing conflicts from from-prod-staging to staging #111

Uh oh!

Conversation

openpublishbuild commented May 21, 2021

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 21, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 22, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 22, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 23, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 25, 2021

❌ Validation status: errors

Uh oh!

opse2esa commented May 25, 2021

❌ Validation status: errors

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants