Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main#1767

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

Resolve syncing conflicts from repo_sync_working_branch to main#1767
learn-build-service-prod[bot] wants to merge 167 commits into
mainfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod

@learn-build-service-prod learn-build-service-prod Bot commented Apr 29, 2026

Copy link
Copy Markdown
Contributor

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

quseleba and others added 16 commits April 8, 2026 13:02
@quseleba @claude
Add CyberArk multi-machine configuration and upsert behavior docs
2f553cd 
- 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>
@claude
Document guest user invitation prerequisite for approvals
d580986 
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>
@claude
Clarify that pending guests are removed from assignee list
33f2d1c 
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>
@EllenWehrle
schema.md update
ce1c365
@iopanag
Added documentation to enable UIAccess
22474bf 
Co-authored-by: Copilot <copilot@github.com>
@iopanag
Minor type
c18bbac
@EllenWehrle
Merge branch 'main' into ew-schema-update
9239cfb
@EllenWehrle
Removed old PPAC images and added one new image of default setting
1ca9cf9 
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.
@iopanag
Fix links
7d10010
@v-aangie
audience-values
fec9194
@v-aangie
force-build
1520282
@v-aangie
Merge pull request #3693 from MicrosoftDocs/oauth-chang
09f926e 
audience values - PM: Kishor Subedi - merge ASAP
@EllenWehrle
Merge branch 'main' into ew-schema-update
8421f51
@EllenWehrle
Merge pull request #3690 from MicrosoftDocs/ew-schema-update
8d49f97 
schema.md update
@v-aangie
Merge branch 'main' into approvals-guest-invitation-prerequisite
c3fddd1
@learn-build-service-prod
Merge pull request #3695 from MicrosoftDocs/main
f2243ed 
Auto Publish – main to live - 2026-04-29 19:00 UTC
@prmerger-automator prmerger-automator Bot added the do-not-merge Don't merge this PR. label Apr 29, 2026
@learn-build-service-prod

learn-build-service-prod Bot commented Apr 29, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit f2243ed:

❌ 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 f2243ed0996a575aa8d798480f27909857b4c9aa 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

learn-build-service-prod Bot commented Apr 30, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit feebf9c:

❌ 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 feebf9cea3610b7c832e92bcde54f9b2d0e74519 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
Merge pull request #3742 from MicrosoftDocs/main
5f6cad9 
Auto Publish – main to live - 2026-06-02 01:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 5f6cad9:

❌ 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 5f6cad9dabd1af6321124eb2bcbac06703b76e44 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

learn-build-service-prod Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 9704fe1:

❌ 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 9704fe133fa1ba82fe299d99df8b67bd48e4c3e5 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.

rosikm and others added 3 commits June 12, 2026 09:40
@rosikm @v-aangie
OCPM - GA (#3744)
78eaae9 
* Revise title and update publication date

Updated the title and date of the object-centric event log article.

* Update date and section title in object-centric filters

Updated the date and modified the section title for clarity.

* Revise title and update date in event log documentation

Updated title and date in the object-centric event log documentation.

* Revise title and update publication date

Updated the title and publication date in the OCPM analysis article.

* Update date in object-centric create event log

* Revise title and update publication date

Updated the title and date in the object-centric process mining overview.

* Revise OCPM process overview metadata and content

Updated the title and date in the metadata, and removed the preview note from the article.

* Update object-centric process mining section titles

* change msdate, toc

* force-build

---------

Co-authored-by: Angie Andrews <angieandrews@microsoft.com>
@rosikm @v-aangie
PI Experience - GA (#3745)
2631e2d 
* Revise title, description, and date in article

Updated the title and description for clarity, and modified the date.

* Revise title and publication date in donut chart article

Updated the title and date in the donut chart article for clarity and accuracy.

* Revise title and update publication date

Updated the title and removed preview mentions in the document. Changed the publication date to June 3, 2026.

* Revise title and update date for edge filter article

Updated the title and date in the article about edge filtering in process intelligence.

* Revise filtering overview title and update date

Updated the title and date in the filtering overview document, and removed preview mentions.

* Revise article on horizontal bar charts in process intelligence

Updated the title, description, and date in the article to reflect current information and removed preview notes.

* Revise KPI card documentation title and date

Updated the title and date in the KPI card documentation, and removed preview references.

* Revise title and update date in line chart article

Updated the title and date in the process-mining-studio-line-chart documentation.

* Revise title, description, and release date in overview

Updated the title and description for clarity, and changed the date to reflect the new release date.

* Revise title and update date in process map article

Updated the title and date in the process mining studio documentation.

* Update title and date in statistical grid article

* Revise tab management article metadata and content

Updated the title and description, and modified the date in the metadata. Removed 'preview' from the title and adjusted the content accordingly.

* Revise title and update date in overview document

Updated the title and date in the visualization cards overview document.

* Revise article title and update publication date

Updated the title and date in the article for clarity and accuracy.

* Revise title and update publication date

Updated the title and date in the article on variant filtering.

* Revise title and update date in documentation

Updated the title and date for the variant DNA documentation.

* Revise title, description, and publication date

Updated the title and description for clarity, adjusted the publication date.

* Rename 'Process intelligence experience (preview)'

* change-msdate

* fix duplicate H1s

* force-build

---------

Co-authored-by: Angie Andrews <angieandrews@microsoft.com>
@learn-build-service-prod
Merge pull request #3751 from MicrosoftDocs/main
999fdae 
Auto Publish – main to live - 2026-06-12 19:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 999fdae:

❌ 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 999fdae926f35c88fa35b7f29b5066c226c633c4 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.

NikosMoutzourakis and others added 2 commits June 15, 2026 16:33
@NikosMoutzourakis
Add HTTP filtering feature for desktop flows (#3752)
06f89ac 
Added section about HTTP filtering to enhance control and security for desktop flows.
@learn-build-service-prod
Merge pull request #3753 from MicrosoftDocs/main
43b2193 
Auto Publish – main to live - 2026-06-16 01:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 43b2193:

❌ 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 43b21934daf2354751fbd2a043049473244474c8 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.

NikosMoutzourakis and others added 2 commits June 16, 2026 15:21
@NikosMoutzourakis
Update HTTP filtering description for clarity (#3754)
6570738 
Clarified the validation criteria for HTTP requests in desktop flows.
@learn-build-service-prod
Merge pull request #3755 from MicrosoftDocs/main
1bd5f07 
Auto Publish – main to live - 2026-06-17 01:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 1bd5f07:

❌ 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 1bd5f07066da33a58a4e89b491a691a29a8e16c5 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.

rosikm and others added 2 commits June 17, 2026 09:56
@rosikm @v-aangie
Clarify task mining process visualization limitations (#3756)
2f64ab7 
* Clarify task mining process visualization limitations

Added a note about task mining processes being analyzable only in the web interface.

* michal-note

* force-build

---------

Co-authored-by: Angie Andrews <angieandrews@microsoft.com>
@learn-build-service-prod
Merge pull request #3757 from MicrosoftDocs/main
13d0884 
Auto Publish – main to live - 2026-06-17 19:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 13d0884:

❌ 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 13d0884a3d961c2d81e0f038ec19f3ab5aebbc6c 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.

jfevia and others added 2 commits June 22, 2026 15:33
@jfevia
Document MSCRM.IncludeUnpublished header for fetching Draft desktop f…
e36e0a6 
…lows (#3747)

The "Request to get desktop flows" example only returned published flows. Added a note to clarify that the default behavior is published-only, plus a second
example showing the MSCRM.IncludeUnpublished: true header that opts in
to including unpublished (Draft) desktop flows.
@learn-build-service-prod
Merge pull request #3758 from MicrosoftDocs/main
ae156dd 
Auto Publish – main to live - 2026-06-23 01:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit ae156dd:

❌ 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 ae156dd4651ad37f615ccffe06ba9f7335572da7 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.

NikosMoutzourakis and others added 2 commits June 23, 2026 15:36
@NikosMoutzourakis
Nikos moutzourakis default vars 10062026 –– publish 6/17 (#3750)
3e512a2 
Revised manage-variables documentation and updated with additional screenshots
@learn-build-service-prod
Merge pull request #3759 from MicrosoftDocs/main
cd6c04f 
Auto Publish – main to live - 2026-06-24 01:00 UTC
@learn-build-service-prod

learn-build-service-prod Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit cd6c04f:

❌ 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 cd6c04fe619084207bef1d97a732d0778ad9df8b 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

Reviewers

@tapanm-MSFT tapanm-MSFT Awaiting requested review from tapanm-MSFT tapanm-MSFT is a code owner
@Mattp123 Mattp123 Awaiting requested review from Mattp123 Mattp123 is a code owner
@v-aangie v-aangie Awaiting requested review from v-aangie v-aangie is a code owner

Assignees

No one assigned

Labels

Change sent to author do-not-merge Don't merge this PR. power-automate/svc process-advisor/subsvc review-team-triage

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.