FFFF
Skip to content

fix: preserve workflow files and guide user on manual push when branch push fails #23926

New issue

Have a question about this project? Sig 7440 n 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
pelikhan merged 2 commits into from
Apr 1, 2026
Merged

fix: preserve workflow files and guide user on manual push when branch push fails #23926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab73ab2
Initial plan
Copilot Apr 1, 2026
b117a04
fix: treat push branch failure as warning with manual instructions (#…
Copilot Apr 1, 2026
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
12 changes: 9 additions & 3 deletions pkg/cli/add_workflow_pr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,15 @@ func addWorkflowsWithPR(workflows []*ResolvedWorkflow, opts AddOptions) (int, st
addWorkflowPRLog.Printf("Pushing branch %s to remote", branchName)
if err := pushBranch(branchName, opts.Verbose); err != nil {
addWorkflowPRLog.Printf("Failed to push branch: %v", err)
if rollbackErr := tracker.RollbackAllFiles(opts.Verbose); rollbackErr != nil && opts.Verbose {
fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to rollback files: %v", rollbackErr)))
}
// Treat push failure as a warning: keep the files and commit intact so the
// user can push manually. Do NOT rollback.
fmt.Fprintln(os.Stderr, console.FormatWarningMessage(fmt.Sprintf("Failed to push branch %s: %v", branchName, err)))
fmt.Fprintln(os.Stderr, console.FormatInfoMessage(
"The workflow files have been committed to local branch "+branchName+".\n"+
" To push the branch and create a pull request, run:\n\n"+
" git push -u origin "+branchName+"\n"+
" gh pr create --title "+fmt.Sprintf("%q", prTitle),
))
return 0, "", fmt.Errorf("failed to push branch %s: %w", branchName, err)
}

Expand Down
Loading
0