Skip to content

Conversation

shoumikhin
Copy link
Contributor

No description provided.

Copy link

pytorch-bot bot commented Oct 5, 2025

🔗 Helpful Links

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

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

✅ You can merge normally! (1 Unrelated Failure)

As of commit 6f779ca with merge base 3d8b8d1 (image):

BROKEN TRUNK - The following job failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

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

@meta-cla meta-cla 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 Oct 5, 2025
Copy link

github-actions bot commented Oct 5, 2025

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

@shoumikhin shoumikhin merged commit ed3fdad into main Oct 6, 2025
375 of 380 checks passed
@shoumikhin shoumikhin deleted the update-tokenizers branch October 6, 2025 16:59
@shoumikhin
Copy link
Contributor Author

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

@pytorchbot
Copy link
Collaborator

Cherry picking #14807

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

hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint:  - go to submodule (extension/llm/tokenizers), and either merge commit ee0ad9b
hint:    or update to an existing commit which has merged those changes
hint:  - come back to superproject and run:
hint:
hint:       git add extension/llm/tokenizers
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
Failed to merge submodule extension/llm/tokenizers (commits don't follow merge-base)
CONFLICT (submodule): Merge conflict in extension/llm/tokenizers
error: could not apply ed3fdad208... Update extension/llm/tokenizers (#14807)
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
ciflow/trunk CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants