Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main #437

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

Merged
merged 28 commits into from
Oct 28, 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.

drewbatgit and others added 27 commits August 8, 2024 12:06
Addressed comments from Eric and Flor
…inla-new

Grabbing the latest version of the page with Kevin's updates
Merging main into live to publish app installer page live
Copy link
Author

Learn Build status updates of commit ce77976:

❌ 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 ce77976377b5b9ca29c93ab4c00e5c2c64eee89e in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/msix-docs into branch main (commit b1056c2ab851a6a8c0d86c211c04b9a121ff04ac). 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 7df138f:

✅ Validation status: passed

File Status Preview URL Details
msix-src/app-installer/app-installer-authentication-manager--overview.md ✅Succeeded
msix-src/app-installer/app-installer-documentation.md ✅Succeeded
msix-src/app-installer/app-installer-root.md ✅Succeeded
msix-src/app-installer/app-installer-security-features.md ✅Succeeded
msix-src/app-installer/app-installer-ui-dialog.md ✅Succeeded
msix-src/app-installer/create-appinstallerfile-vs.md ✅Succeeded
msix-src/app-installer/How-to-create-custom-app-installer-ux.md ✅Succeeded
msix-src/app-installer/images/app-installer-smart-screen.png ✅Succeeded
msix-src/app-installer/images/app-installer-ui-dialog-update.png ✅Succeeded
msix-src/app-installer/images/app-installer-ui-dialog.png ✅Succeeded
msix-src/app-installer/images/app-installer-zone-error.png ✅Succeeded
msix-src/app-installer/install-parameters.md ✅Succeeded
msix-src/app-installer/installing-windows10-apps-web.md ✅Succeeded
msix-src/comparisonofappvwithmsix.md ✅Succeeded
msix-src/desktop/app-attach-from-visualstudio.md ✅Succeeded
msix-src/desktop/azure-dev-ops.md ✅Succeeded
msix-src/docfx.json ✅Succeeded
msix-src/package/signing-package-device-guard-signing.md ✅Succeeded
msix-src/packaging-tool/create-app-package.md ✅Succeeded
msix-src/packaging-tool/insider-program.md ✅Succeeded
msix-src/packaging-tool/package-analyzer.md ✅Succeeded
msix-src/packaging-tool/package-conversion-command-line.md ✅Succeeded
msix-src/packaging-tool/package-editor.md ✅Succeeded
msix-src/packaging-tool/tool-best-practices.md ✅Succeeded
msix-src/psf/package-support-framework-overview.md ✅Succeeded

This comment lists only the first 25 files in the pull request.
For more details, please refer to the build report.

For any questions, please:

@drewbatgit drewbatgit merged commit 1ac2b5f into main Oct 28, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants