mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #2523 from jellyfin/merge-conflict-pr
Run merge conflict check on PR rebase/commit
This commit is contained in:
commit
d3bb88c6d2
1 changed files with 3 additions and 0 deletions
3
.github/workflows/merge-conflicts.yml
vendored
3
.github/workflows/merge-conflicts.yml
vendored
|
@ -4,6 +4,9 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
pull_request:
|
||||
types:
|
||||
- synchronize
|
||||
jobs:
|
||||
triage:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue