Skip to content

Falied create_pull_request or push_to_pull_request_branch due to merge conflict should create better fallback issue #20420

@dsyme

Description

@dsyme

When a workflow fails because create_pull_request couldn't apply the patch because of a merge conflict, a fallback issue should be created with instructions about how to get the patch and apply it manually etc. like other fallback cases

Here's an example of the kind of issue being created today:

### Workflow Failure

**Workflow:** [CI/CD Advisor](#)  
**Branch:** main  
**Run:** https://github.com/githubnext/can-i-improve-my-ci/actions/runs/22926289615


**⚠️ Code Push Failed**: A code push safe output failed, and subsequent safe outputs were cancelled.
**Code Push Errors:**
- `create_pull_request`: Failed to apply patch



### Action Required

**Option 1: Debug using any coding agent**

Use this prompt with any coding agent (GitHub Copilot, Claude, Gemini, etc.):

Debug the agentic workflow failure using https://raw.githubusercontent.com/github/gh-aw/main/debug.md

The failed workflow run is at https://github.com/githubnext/can-i-improve-my-ci/actions/runs/22926289615


**Option 2: Assign this issue to Copilot**

Assign this issue to Copilot using the `agentic-workflows` sub-agent to automatically debug and fix the workflow failure.

**Option 3: Manually invoke the agent**

Debug this workflow failure using your favorite Agent CLI and the `agentic-workflows` prompt.

- Start your agent
- Load the `agentic-workflows` prompt from `.github/agents/agentic-workflows.agent.md` or <https://github.com/github/gh-aw/blob/main/.github/agents/agentic-workflows.agent.md>
- Type `debug the agentic workflow ci-advisor failure in https://github.com/githubnext/can-i-improve-my-ci/actions/runs/22926289615`

> [!TIP]
> To stop a workflow from creating failure issues, set `report-failure-as-issue: false` in its frontmatter:
> ```yaml
> safe-outputs:
>   report-failure-as-issue: false
> ```


> Generated from [CI/CD Advisor](https://github.com/githubnext/can-i-improve-my-ci/actions/runs/22926289615)
> - [x] expires <!-- gh-aw-expires: 2026-03-17T22:17:13.802Z --> on Mar 17, 2026, 10:17 PM UTC

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions