8000 Merge pull request #24156 from oscargus/mergeconflicts · matplotlib/matplotlib@bbde887 · GitHub
[go: up one dir, main page]
Skip to content

Commit bbde887

Browse files
QuLogicQuLogic
authored
Merge pull request #24156 from oscargus/mergeconflicts
Automatically update rebase label
2 parents 8207d6f + 4ac1351 commit bbde887

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

‎.github/workflows/conflictcheck.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Maintenance"
2+
on:
3+
# So that PRs touching the same files as the push are updated
4+
push:
5+
# So that the `dirtyLabel` is removed if conflicts are resolve
6+
# We recommend `pull_request_target` so that github secrets are available.
7+
# In `pull_request` we wouldn't be able to change labels of fork PRs
8+
pull_request_target:
9+
types: [synchronize]
10+
11+
jobs:
12+
main:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Check if PRs have merge conflicts
16+
uses: eps1lon/actions-label-merge-conflict@releases/2.x
17+
with:
18+
dirtyLabel: "status: needs rebase"
19+
repoToken: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)
0