github / github/gh-stack

sync might not work with worktree

Open
#87 2 comments 15 reactions 1 assignee Claimed by @skarim View on GitHub
bug topic: cli - worktrees
Dominant language
Go
Stars
1.5k
Forks
70
Avg merge
1d 8h
Merged PRs (30d)
7

Description

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`

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.