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
> gh stack rebase
✓ Fetched origin
⚠ Failed to fast-forward main: failed to run git: fatal: cannot force update the branch 'main' used by worktree at '/co/main'
Stack detected: (main) <- tf/prod <- tf/subnets
Rebasing branches in order, starting from tf/prod-name to tf/subnets
✓ Skipping tf/prod (PR #99 merged)
⚠ Rebasing tf/subnets onto main — conflict
I was able to fix it by detaching from the main branch in the main worktree. There were no true conflicts in this stack.
Seems to me there are two issues:
stacks should run against origin/main, rather than local main.
failing to update main should abort immediately, rather than attempt the rebase.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
-
While on a worktree, I got
I was able to fix it by detaching from the
mainbranch in the main worktree. There were no true conflicts in this stack.Seems to me there are two issues:
Beta Was this translation helpful? Give feedback.
All reactions