Skip to content

sync might not work with worktree #87

@gilles

Description

@gilles

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions