Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main - #1771

Open
learn-build-service-prod[bot] wants to merge 207 commits into
mainfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to main#1771
learn-build-service-prod[bot] wants to merge 207 commits into
mainfrom
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 main.

Quentin SELE (quseleba) and others added 30 commits April 8, 2026 13:02
- Added new section "Configure CyberArk for multiple machines or groups"
  explaining the centralized wizard approach from the CyberArk tab
- Added note about upsert behavior: when creating an application with
  the same ID, the existing configuration is automatically replaced

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Approval emails are not sent to external/guest users who have not
accepted the B2B tenant invitation. If all assignees are filtered
out (all pending guests), the approval creation fails. This adds
the prerequisite and known issue documentation across three pages.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Pending-invitation guest users are actively removed from the
assignedTo list, not just skipped for email notifications. Updated
language across all three pages to reflect this behavior.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Copilot <copilot@github.com>
I also modified two sections to be more up to date with PPAC steps and reflect the fact that  v1 was deprecated a while back.
audience values - PM: Kishor Subedi - merge ASAP
Auto Publish – main to live - 2026-04-29 19:00 UTC
…n-prerequisite

Document guest user invitation prerequisite for approvals
Auto Publish – main to live - 2026-04-30 01:00 UTC
Additional update to Roles and privileges section
Auto Publish – main to live - 2026-05-04 19:00 UTC
* Clarify child flow capacity in flow groups

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

* Use active voice in flow group limits

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

* edits-Matt-and-LAA

---------

Co-authored-by: Matt Townsend <matow+microsoft@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Angie Andrews <angieandrews@microsoft.com>
Auto Publish – main to live - 2026-08-01 01:00 UTC
* Deprecate Record with Copilot

Updated the document to reflect the deprecation of Record with Copilot and provided alternatives for creating desktop flows.

* AI-recorder

* toc update

* fix metadata

* feature name

---------

Co-authored-by: nrallakis <nrallakis4@gmail.com>
Auto Publish – main to live - 2026-08-04 01:00 UTC
* Update SQL connection instructions in Excel guide

Updated the date and changed the installation instructions for the connection string.

* Fix date format in sql-queries-excel.md

* Update note on using connection string for Excel

Clarified note just a bit per Alex's suggestion.

* Update articles/desktop-flows/how-to/sql-queries-excel.md

Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

---------

Co-authored-by: Linda Cannon <lindalu@microsoft.com>
Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>
* Fix Markdown link syntax

* public-link-and-standards

---------

Co-authored-by: Beatriz Guerra <112095294+bguerra-97@users.noreply.github.com>
Auto Publish – main to live - 2026-08-06 19:00 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 07edb4b:

❌ 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 07edb4b2a87c92c0846c4f36da18d41b3519ef5b in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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.

…n support deflection and customer feedback (#3677)

* Improve Install Power Automate article based on support and feedback data

- Add comparison table for MSI vs Store installation methods
- Add clearer guidance for finding the correct MSI installer download
- Improve .NET 8 troubleshooting with step-by-step resolution
- Add new Troubleshoot common installation issues section addressing:
  - Installation failures with no error message
  - Error code 1603 (VDI/permissions)
  - Can't launch Power Automate after installation
  - Version mismatch across environments
- Improve Determining which install section with clearer formatting
- Add tips for proxy/network requirements
- Update ms.date

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

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Style edits and header updates

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-09[bot] <274431102+learn-build-service-prod-09[bot]@users.noreply.github.com>

* Update author information in install.md

* Revise installation guide for Power Automate

Updated installation instructions and requirements for Power Automate, including changes to .NET version and installation notes.

* Fix formatting in install.md for clarity

* Apply suggestion from @learn-build-service-prod-05[bot]

Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>

* Update articles/desktop-flows/install.md

Co-authored-by: learn-build-service-prod-06[bot] <274430002+learn-build-service-prod-06[bot]@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Ellen Wehrle <97743630+EllenWehrle@users.noreply.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-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>
Co-authored-by: learn-build-service-prod-06[bot] <274430002+learn-build-service-prod-06[bot]@users.noreply.github.com>
Auto Publish – main to live - 2026-08-07 01:00 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 74d2386:

❌ 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 74d238621a5e56a27897faaf3c119f107091732e in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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
Copy Markdown
Contributor Author

Learn Build status updates of commit 19ef273:

❌ 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 19ef273594f2382747025470de4da0bf8716c763 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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
Copy Markdown
Contributor Author

Learn Build status updates of commit 46581f0:

❌ 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 46581f0ed433b2f6ef3ec6858bfb51830d9fce78 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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.

* install-desktop

* Apply suggestions from code review

Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@users.noreply.github.com>

* PAD-review-edit

* Apply suggestions from code review

Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

---------

Co-authored-by: learn-build-service-prod-08[bot] <274430765+learn-build-service-prod-08[bot]@users.noreply.github.com>
Co-authored-by: Ellen Wehrle <97743630+EllenWehrle@users.noreply.github.com>
Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>
Auto Publish – main to live - 2026-08-13 19:00 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit e7b07f9:

❌ 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 e7b07f9cee1f8e7cc66ea7ddc1f89de2c4b0d5fb in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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.

…3762)

* docs: assign a user license to a service principal owned flow

Rebuilt on current main (previous branch predated the flow groups merge).

- New article: assign-user-license-service-principal-flow.md
- Add TOC entry next to Support for service principal owned flows
- Update service-principal-support.md licensing requirements, which
  enumerated only Process / per-flow / flow group and omitted the
  designated user license option

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

* Clarify that the designated user must hold a license sufficient for the flow's premium features

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

* Add programmatic assignment guidance and apply reviewer answers

- Add 'Assign a user license programmatically' with Dataverse connector
  steps first, then Dataverse Web API (PATCH/GET/DELETE)
- Document the Licensee lookup on the Process (workflow) table, verified
  against live Dataverse metadata
- Clarify suspension recovery: takes effect on save if the flow is on;
  turn the flow on if it was off
- Remove solution-version and availability caveats; feature is GA

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

* Document verified removal and read-back behavior for the Licensee column

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

* Use the actual Dataverse connector field label, Licensee (Users)

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

* Apply Learn style suggestions and make license effect immediate

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

* new licensing and update to support

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Matt Townsend <matow+microsoft@microsoft.com>
Co-authored-by: Angie Andrews <angieandrews@microsoft.com>
Auto Publish – main to live - 2026-08-15 01:00 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 14ab0bc:

❌ 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 14ab0bcc148efffcb4541e078f7b9bc4699e71af in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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.

* first 15 August freshness

* fixes
Auto Publish – main to live - 2026-08-16 07:00 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 2c1b417:

❌ 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 2c1b417b7157ffc156c4a55369e502b009bb52d8 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-automate-docs into branch main (commit e7a4c26faaa37ea3432ea7011957f3e72af745c1). 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

do-not-merge Don't merge this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.