Skip to content

Commit 74b3e28

Browse files
authored
fix(ci): fix version in conflict-check.yml
1 parent f061f89 commit 74b3e28

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/conflict-check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
name: Check PRs for conflicts
77

88
on:
9+
push:
910
pull_request_target:
1011
types: [synchronize]
1112

@@ -14,9 +15,9 @@ jobs:
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Check if PRs are dirty
17-
uses: eps1lon/actions-label-merge-conflict@releases/3.0.3
18+
uses: eps1lon/actions-label-merge-conflict@v3
1819
with:
1920
dirtyLabel: "has merge conflicts"
2021
repoToken: "${{ secrets.GITHUB_TOKEN }}"
2122
commentOnDirty: |
22-
This pull request has conflicts, please rebase to resolve those before we can evaluate the pull request.
23+
This pull request has conflicts, please rebase to resolve those before we can evaluate the pull request.

0 commit comments

Comments
 (0)