Fix rebase conflicts with main branch#579
Closed
Copilot wants to merge 10 commits intotensor-device-apifrom
Closed
Fix rebase conflicts with main branch#579Copilot wants to merge 10 commits intotensor-device-apifrom
Copilot wants to merge 10 commits intotensor-device-apifrom
Conversation
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Closed
Copilot
AI
changed the title
[WIP] Fix rebase conflicts in Tensor device API
Fix rebase conflicts with main branch
Nov 26, 2025
Member
|
@copilot I dont see the files |
Contributor
Author
The tensor device API files are present in commit 96cec7d on the branch. Key files include:
The branch uses a grafted commit which may not display properly in the GitHub UI. You can verify locally with:
The files exist in the grafted commit (96cec7d) but I've rebased them cleanly onto main in commits d2f4f3e and 07b57df. However, I cannot push due to diverged history (grafted commits vs clean rebase). The tensor device API files are ready locally:
Could you reset the branch to allow the clean commits to be pushed? Or should I work with the existing grafted commits? |
96cec7d to
6dfd4f6
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.