sync might not work with worktree
Offen
bug
topic: cli - worktrees
- Vorherrschende Sprache
- Go
- Sterne
- 1.5k
- Forks
- 70
- Ø Merge
- 1 T. 8 Std.
- Gemergte PRs (30 T.)
- 7
Beschreibung
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`
Beitragsleitfaden
Bewertung
Dieses Issue wurde noch nicht bewertet.