Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 03c94a2

Browse filesBrowse files
rcomerrcomer
authored
Merge pull request #28038 from meeseeksmachine/auto-backport-of-pr-28023-on-v3.9.x
Backport PR #28023 on branch v3.9.x (ci: Update merge conflict labeler)
2 parents 5dffb5b + a9e5ee3 commit 03c94a2
Copy full SHA for 03c94a2

File tree

Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed

‎.github/workflows/conflictcheck.yml

Copy file name to clipboardExpand all lines: .github/workflows/conflictcheck.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check if PRs have merge conflicts
20-
uses: eps1lon/actions-label-merge-conflict@releases/2.x
20+
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
2121
with:
2222
dirtyLabel: "status: needs rebase"
2323
repoToken: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.