Skip to content

Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory #9976

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 1 commit into from
Apr 8, 2025

Conversation

shoumikhin
Copy link
Contributor

No description provided.

@shoumikhin shoumikhin requested a review from kirklandsign as a code owner April 8, 2025 19:52
Copy link

pytorch-bot bot commented Apr 8, 2025

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/9976

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit cfebdf5 with merge base 8d80185 (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 8, 2025
@shoumikhin shoumikhin added topic: not user facing and removed CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. labels Apr 8, 2025
@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 8, 2025
@shoumikhin shoumikhin merged commit e6c2907 into main Apr 8, 2025
96 of 97 checks passed
@shoumikhin shoumikhin deleted the shoumikhin-patch-3 branch April 8, 2025 22:41
@shoumikhin
Copy link
Contributor Author

@pytorchbot cherry-pick --onto release/0.6 -c fixnewfeature

@pytorchbot
Copy link
Collaborator

Cherry picking #9976

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs e6c2907e98e9522b67e17b2bff8ecf7f564c4417 returned non-zero exit code 1

CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj left in tree.
CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/README.md deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/README.md left in tree.
error: could not apply e6c2907e9... Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

@shoumikhin
Copy link
Contributor Author

@pytorchbot cherry-pick --onto release/0.6 -c fixnewfeature

@pytorchbot
Copy link
Collaborator

Cherry picking #9976

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs e6c2907e98e9522b67e17b2bff8ecf7f564c4417 returned non-zero exit code 1

CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj left in tree.
CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/README.md deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/README.md left in tree.
error: could not apply e6c2907e9... Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

shoumikhin added a commit that referenced this pull request Apr 9, 2025
@shoumikhin
Copy link
Contributor Author

@pytorchbot cherry-pick --onto release/0.6 -c fixnewfeature

@pytorchbot
Copy link
Collaborator

Cherry picking #9976

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs e6c2907e98e9522b67e17b2bff8ecf7f564c4417 returned non-zero exit code 1

CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj left in tree.
CONFLICT (modify/delete): examples/demo-apps/apple_ios/ExecuTorchDemo/README.md deleted in e6c2907e9 (Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)) and modified in HEAD.  Version HEAD of examples/demo-apps/apple_ios/ExecuTorchDemo/README.md left in tree.
error: could not apply e6c2907e9... Delete examples/demo-apps/apple_ios/ExecuTorchDemo directory (#9976)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. topic: not user facing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants