Skip to content

fix(cli): handle rebase abort crash in CI pull-request flow #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cherkanovart merged 1 commit into from
Feb 23, 2026
Merged

fix(cli): handle rebase abort crash in CI pull-request flow #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix-ci-rebase-abort-crash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"lingo.dev": patch
---

fix(cli): handle rebase abort gracefully when no rebase is in progress
10 changes: 7 additions & 3 deletions packages/cli/src/cli/cmd/ci/flows/pull-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
Expand Down