diff --git a/.changeset/fix-ci-rebase-abort-crash.md b/.changeset/fix-ci-rebase-abort-crash.md new file mode 100644 index 000000000..59bcdc206 --- /dev/null +++ b/.changeset/fix-ci-rebase-abort-crash.md @@ -0,0 +1,5 @@ +--- +"lingo.dev": patch +--- + +fix(cli): handle rebase abort gracefully when no rebase is in progress diff --git a/packages/cli/src/cli/cmd/ci/flows/pull-request.ts b/packages/cli/src/cli/cmd/ci/flows/pull-request.ts index 6fcad7e86..1ae01187f 100644 --- a/packages/cli/src/cli/cmd/ci/flows/pull-request.ts +++ b/packages/cli/src/cli/cmd/ci/flows/pull-request.ts @@ -156,9 +156,13 @@ export class PullRequestFlow extends InBranchFlow { } catch (error) { this.ora.warn("Rebase failed, falling back to alternative sync method"); - this.ora.start("Aborting failed rebase"); - execSync("git rebase --abort", { stdio: "inherit" }); - this.ora.succeed("Aborted failed rebase"); + try { + this.ora.start("Aborting failed rebase"); + execSync("git rebase --abort", { stdio: "inherit" }); + this.ora.succeed("Aborted failed rebase"); + } catch { + this.ora.warn("No rebase in progress to abort"); + } this.ora.start( `Resetting to ${this.platformKit.platformConfig.baseBranchName}`,