Skip to content

ship: retry after partial ship fails with non-fast-forward push #94

@erishforG

Description

@erishforG

Problem

When parsec ship partially succeeds (push OK, PR creation fails), the worktree is preserved and the user is told to retry. If the user amends the commit before retrying, the push fails with non-fast-forward error because git push -u origin <branch> doesn't handle diverged history.

Expected

parsec ship should use --force-with-lease when pushing, which safely handles amended commits while still preventing accidental overwrites.

Reproduction

  1. parsec ship <ticket> → push succeeds, PR creation fails (e.g., 401)
  2. Fix issue, amend commit
  3. parsec ship <ticket> → fails with non-fast-forward

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions