Skip to content

Commit 5c310f7

Browse files
authored
fix(events): address merge conflicts to run PR workflows
Workflows will not run on `pull_request` activity if the pull request has a merge conflict with the target branch. Please see the following GitHub forum discussion for more details - https://github.community/t/run-actions-on-pull-requests-with-merge-conflicts/17104/2
1 parent 943be2a commit 5c310f7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

content/actions/reference/events-that-trigger-workflows.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ Runs your workflow anytime the `pull_request` event occurs. {% data reusables.de
571571

572572
**Note:** By default, a workflow only runs when a `pull_request`'s activity type is `opened`, `synchronize`, or `reopened`. To trigger workflows for more activity types, use the `types` keyword.
573573

574+
**Note:** Workflow will not run on `pull_request` activity if the pull request has a merge conflict. The merge conflict must be resolved first.
575+
574576
{% endnote %}
575577

576578
| Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |

0 commit comments

Comments
 (0)