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 #122478

Merged
merged 4,063 commits into from
May 21, 2024

Conversation

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

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

Copy link
Contributor Author

Learn Build status updates of commit b04873e:

❌ 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 b04873eef360826757ad16906c98116f9284c279 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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:

@Jak-MS Jak-MS closed this May 13, 2024
@Jak-MS Jak-MS reopened this May 13, 2024
Copy link
Contributor Author

Learn Build status updates of commit b04873e:

❌ 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 b04873eef360826757ad16906c98116f9284c279 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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
Contributor Author

Learn Build status updates of commit 03c1d39:

❌ 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 03c1d3954db2e760e6470090ca2eff2714c50898 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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:

@Jak-MS
Copy link
Contributor

Jak-MS commented May 14, 2024

@huypub @tfosmark - bringing your attention to this failed repo_sync PR (due to merge conflicts) ... and noting that these conflicts cannot be resolved in the PR.

Also, to complicate things, this repo and it's private '-pr' counterpart are in content freeze. Relying on your good wisdom on how to proceed. thanks.

cc: @MicrosoftDocs/public-repo-pr-review-team

@huypub
Copy link
Contributor

huypub commented May 14, 2024

@Jak-MS
The sync from the public to the private repo of azure-docs-pr is disabled since 5/08. So it is better that we come back to this after Build 2024 (5/21).

Copy link
Contributor Author

Learn Build status updates of commit 3fad646:

❌ 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 3fad646d8c8f1e6bf17e0727b1ab7b5ee1775847 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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
Contributor Author

Learn Build status updates of commit 48ade3a:

❌ 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 48ade3a792fbaef96838883c52efe424e2f0a9f1 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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
Contributor Author

Learn Build status updates of commit 68f1297:

❌ 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 68f1297fa0295ee14596d66c649e465671ab86e1 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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
Contributor Author

Learn Build status updates of commit b1020a7:

❌ 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 b1020a731cc1de60135b38b46bea6ac60fc7ffb9 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/azure-docs into branch main (commit 211d3450211c26e95c6f40b4e01bd3adf5077774). 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:

chen-karen and others added 16 commits May 21, 2024 08:41
[Functions][Build 2024][Flex] Updates to the Event Grid Blob Storage tutorial
[azure search] Updates to RBAC doc (main branch)
Update understanding-error-codes.md
v-regandowner and others added 25 commits May 21, 2024 12:32
Add limits on API Management REST API calls to Request trigger in Standard workflows
[azure search] REST API updates to create vector index
Alert mapping between legacy and Prometheus alerts
Refer beta api version instead of alpha for istio ingress gateway articles
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
[APIM] Subnet requirements - VNet integration
Update api-management-policies-azure-copilot.md
[APIM] SHGW connectivity from internet
@learn-build-service-prod learn-build-service-prod bot merged commit fe54a7d into main May 21, 2024
1 check was pending
@learn-build-service-prod learn-build-service-prod bot deleted the repo_sync_working_branch branch May 21, 2024 17:43
Copy link
Contributor Author

Learn Build status updates of commit fe54a7d:

💡 Validation status: suggestions

File Status Preview URL Details
articles/ai-services/computer-vision/computer-vision-how-to-install-containers.md 💡Suggestion Details
articles/ai-services/computer-vision/concept-background-removal.md 💡Suggestion Details
articles/ai-services/computer-vision/concept-shelf-analysis.md 💡Suggestion Details
articles/ai-services/computer-vision/how-to/shelf-analyze.md 💡Suggestion Details
articles/ai-services/computer-vision/how-to/shelf-model-customization.md 💡Suggestion Details
articles/ai-services/computer-vision/how-to/shelf-planogram.md 💡Suggestion Details
articles/ai-services/computer-vision/language-support.md 💡Suggestion Details
articles/ai-services/computer-vision/sdk/overview-sdk.md 💡Suggestion Details
articles/ai-services/computer-vision/toc.yml 💡Suggestion Details
articles/ai-services/computer-vision/whats-new.md 💡Suggestion Details
articles/ai-services/custom-vision-service/copy-move-projects.md 💡Suggestion Details
articles/ai-services/custom-vision-service/includes/quickstarts/rest-tutorial.md 💡Suggestion Details
articles/ai-services/custom-vision-service/select-domain.md 💡Suggestion Details
articles/ai-services/custom-vision-service/storage-integration.md 💡Suggestion Details
articles/ai-services/custom-vision-service/toc.yml 💡Suggestion Details
articles/ai-services/custom-vision-service/use-prediction-api.md 💡Suggestion Details
articles/ai-studio/how-to/develop/sdk-overview.md 💡Suggestion Details
.openpublishing.publish.config.json ✅Succeeded
.openpublishing.redirection.api-center.json ✅Succeeded
.openpublishing.redirection.azure-kubernetes-service.json ✅Succeeded
.openpublishing.redirection.azure-monitor.json ✅Succeeded
.openpublishing.redirection.json ✅Succeeded
.openpublishing.redirection.operator-service-manager.json ✅Succeeded
.openpublishing.redirection.sentinel.json ✅Succeeded
articles/active-directory-b2c/microsoft-graph-operations.md ✅Succeeded

This comment lists only the first 25 files in the pull request.

articles/ai-services/computer-vision/computer-vision-how-to-install-containers.md

  • Line 347, Column 16: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v3.2-preview

articles/ai-services/computer-vision/concept-background-removal.md

  • Line 55, Column 57: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/image-analysis/segment?view=rest-computervision-2023-02-01-preview&tabs=HTTP

articles/ai-services/computer-vision/concept-shelf-analysis.md

  • Line 186, Column 3: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/computer-vision/how-to/shelf-analyze.md

  • Line 158, Column 3: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/computer-vision/how-to/shelf-model-customization.md

  • Line 71, Column 3: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/computer-vision/how-to/shelf-planogram.md

  • Line 303, Column 3: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/computer-vision/language-support.md

  • Line 130, Column 22: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/analyze-image?view=rest-computervision-v3.1

articles/ai-services/computer-vision/sdk/overview-sdk.md

  • Line 25, Column 218: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview
  • Line 28, Column 339: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/computer-vision/toc.yml

  • Line 82, Column 13: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v3.2-preview
  • Line 84, Column 13: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v3.1
  • Line 86, Column 13: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v2.1
  • Line 248, Column 15: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview
  • Line 274, Column 15: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v3.1
  • Line 276, Column 15: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-v2.1

articles/ai-services/computer-vision/whats-new.md

  • Line 37, Column 216: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview
  • Line 40, Column 336: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview

articles/ai-services/custom-vision-service/copy-move-projects.md

  • Line 17, Column 7: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/export?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 17, Column 127: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/import?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 42, Column 14: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/get?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 80, Column 8: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/export?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 105, Column 8: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/import?view=rest-customvision-training-v3.3&tabs=HTTP

articles/ai-services/custom-vision-service/includes/quickstarts/rest-tutorial.md

  • Line 45, Column 102: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/create?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 102, Column 152: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/images/create-from-data?view=rest-customvision-training-v3.3&tabs=HTTP
  • Line 121, Column 48: [Suggestion: preserve-view-not-set - See documentation] You've pinned this link to a specific version of content with the view parameter. It's recommended not to pin a version unless that version is A) not the default view and B) the context is about that version specifically. To proceed with pinning a version add the &preserve-view=true to the URL. Otherwise, remove the view parameter. URL: /rest/api/customvision/training/projects/train?view=rest-customvision-training-v3.3&tabs=HTTP

This comment lists only the first 25 errors (including error/warning/suggestion) in the pull request.
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
Contributor

PRMerger Results

Issue Description
Added File(s) This PR contains added files. New files require human review.
Deleted File(s) This PR deletes Markdown or YAML files owned by another author, or json file(s). The pull request must contain a comment from the pull request author confirming that all the file deletions are intentional before the pull request can be merged.
Yaml File(s) This PR includes changes to .yml file(s) owned by another author.
Changed Files This PR contains more than 10 changed files.
Commits Count This PR contains more than 15 commits.
File Change Percent This PR contains file(s) with more than 30% file change.
GDPR Content(s) PR references GDPR and must be human reviewed to ensure appropriate guidelines are followed.
Image File This PR added or updated an image file(s).
Json File This PR contains json file(s).
Repository root file This pull request contains a file submitted to the root of the repository.

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.

None yet