From ab73ab2eec0dda80912dc38a9d7740ab4344d63b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 1 Apr 2026 16:25:27 +0000 Subject: [PATCH 1/2] Initial plan From b117a048ddeee558f3605009351e79bdc657380c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 1 Apr 2026 16:37:59 +0000 Subject: [PATCH 2/2] fix: treat push branch failure as warning with manual instructions (#issue) Agent-Logs-Url: https://github.com/github/gh-aw/sessions/77801893-44e8-42c5-8cca-85982ecd34ce Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com> --- pkg/cli/add_workflow_pr.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/cli/add_workflow_pr.go b/pkg/cli/add_workflow_pr.go index 995702a4c94..54df1f6adda 100644 --- a/pkg/cli/add_workflow_pr.go +++ b/pkg/cli/add_workflow_pr.go @@ -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) }