You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I had some merge conflicts with 2 branches that I had adopted using av adopt. Manually rebasing them didn't have any issues.
Original branch tree: main -> landing -> landing-build
✅ I orphaned the branches to remove them from aviator
✅ av tree no longer showed the branches
❌ running av sync still tries to restack the orphaned branches:
⣽ Restacking landing-build...
Rebase conflict while rebasing landing-build
Failed to rebase "refs/heads/landing-build" onto "refs/heads/landing"
✅ I deleted the branches locally using git branch -D (the branches are already deleted off remote after the PRs were merged)
❌ running av sync still tries to restack the orphaned branch:
⣽ Restacking landing-build...
error: failed to get branch "refs/heads/landing": reference not found
❌ running av sync --current on the new branch I'm trying to update still has the same error. I would expect it to sync only that part of the tree
❌ av tidy shows nothing to do:
✓ No branch to tidy
The text was updated successfully, but these errors were encountered:
For anyone else experiencing this, the way to hack out of this situation is to:
Go to main and re-create the branches that av is trying to restack. In my case: landing and landing-build
Run av sync and it will come up with the rebase conflicts again
Run av sync --skip repeatedly until it finishes the restack
✓ Restack is done
Caught panic:
invariant error: cannot read branch state for empty branch name
Restoring terminal...
error: program was killed: context canceled
Switch to main and run av sync (yes to this is truck)
I had some merge conflicts with 2 branches that I had adopted using
av adopt
. Manually rebasing them didn't have any issues.Original branch tree:
main
->landing
->landing-build
✅ I orphaned the branches to remove them from aviator
✅
av tree
no longer showed the branches❌ running
av sync
still tries to restack the orphaned branches:✅ I deleted the branches locally using
git branch -D
(the branches are already deleted off remote after the PRs were merged)❌ running
av sync
still tries to restack the orphaned branch:⣽ Restacking landing-build... error: failed to get branch "refs/heads/landing": reference not found
❌ running
av sync --current
on the new branch I'm trying to update still has the same error. I would expect it to sync only that part of the tree❌
av tidy
shows nothing to do:The text was updated successfully, but these errors were encountered: