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 get conflicts when syncing after a merge gh stack sync has a warning
⚠ Failed to fast-forward master: failed to run git: fatal: cannot force update the branch 'master' used by worktree at 'XXX'
seems the fix is to git rebase --onto origin/master but gh stack rebase does not have --onto
Reacted by Aron Strandberg, Simon Law, Andrei Zhidkov, Eddie Stanley, Andrew Jorgensen, Daniel Genezini, Gentur, David Myers, Mathis Wiehl, Florian Gallrein and 8 more
I have a tested fix available on this branch, but repository permissions prevent me from creating a PR. Could a maintainer help me get the necessary access?
Activity
loganrosen commentedon Jul 17, 2026
I have a tested fix available on this branch, but repository permissions prevent me from creating a PR. Could a maintainer help me get the necessary access?
dgenezini commentedon Jul 22, 2026
@skarim , any updates on this? It happens with any command and is a pain when working with worktrees.