Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve syncing conflicts from repo_sync_working_branch to main #2641

Merged
merged 79 commits into from
Jun 7, 2024

Conversation

learn-build-service-prod[bot]
Copy link

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

laneswenka and others added 30 commits June 5, 2024 15:00
Updates for UDE GA
Updates for UDE GA
Unodev GA
UDE GA
UDE GA
Update to the articles with Neha and Saurabh
Copy link
Author

Learn Build status updates of commit 7c1a439:

❌ 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 7c1a439c7632cc748855f68ae14fa42be3d5d051 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-platform into branch main (commit 3a8a00a279053bf8f4f2706ba617bc93b5e61859). 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.

For any questions, please:

Copy link
Author

Learn Build status updates of commit 436af83:

❌ 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 436af832370879bd4598db873440773ed89cccdb in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-platform into branch main (commit 3a8a00a279053bf8f4f2706ba617bc93b5e61859). 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.

For any questions, please:

Copy link
Author

Learn Build status updates of commit 9a14e0d:

❌ 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 9a14e0d7daa02dd156d2a201bf742f13d0dcbae0 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/power-platform into branch main (commit 3a8a00a279053bf8f4f2706ba617bc93b5e61859). 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.

For any questions, please:

Copy link
Author

Learn Build status updates of commit a735345:

⚠️ Validation status: warnings

File Status Preview URL Details
power-platform/developer/unified-experience/finance-operations-dev-overview.md ⚠️Warning Details
power-platform/admin/manage-teams.md ✅Succeeded
power-platform/admin/TOC.yml ✅Succeeded
power-platform/admin/unified-experience/admin-trials.md ✅Succeeded
power-platform/admin/unified-experience/finance-operations-apps-overview.md ✅Succeeded
power-platform/admin/unified-experience/media/tutorial-install-app-platformTools.png ✅Succeeded
power-platform/admin/unified-experience/media/tutorial-install-app2.png ✅Succeeded
power-platform/admin/unified-experience/partners-systems-implementers.md ✅Succeeded
power-platform/admin/unified-experience/tutorial-copy-lifecycle-services-environment-unified-environment.md ✅Succeeded
power-platform/admin/unified-experience/tutorial-deploy-new-environment-with-ERP-template.md ✅Succeeded
power-platform/admin/unified-experience/tutorial-install-finance-operations-provisioning-app.md ✅Succeeded
power-platform/admin/unified-experience/tutorial-update-finance-operations-provisioning-app.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-debug.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-faq.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-install-config-tools.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-pipeline-test.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-pipelines.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-product-db-access.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-testing.md ✅Succeeded
power-platform/developer/unified-experience/finance-operations-trace-parser.md ✅Succeeded
power-platform/guidance/adoption/capacity-and-licenses.md ✅Succeeded
power-platform/power-fx/reference/function-filter-lookup.md ✅Succeeded
power-platform/power-fx/reference/function-patch.md ✅Succeeded

power-platform/developer/unified-experience/finance-operations-dev-overview.md

  • Line 56, Column 1: [Warning: bookmark-not-found - See documentation] Cannot find bookmark '#tutorial-provision-a-new-environment-with-an-erp-based-template-preview' in 'admin/unified-experience/tutorial-deploy-new-environment-with-ERP-template.md'.

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.

For any questions, please:

@phecke phecke merged commit 9354dfc into main Jun 7, 2024
3 checks passed
@phecke phecke deleted the repo_sync_working_branch branch June 7, 2024 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.