Merge pull request #2523 from jellyfin/merge-conflict-pr

Run merge conflict check on PR rebase/commit
2021-03-26 20:16:37 +09:00
parent 6a60938b09 8ce58f611b
commit d3bb88c6d2
1 changed files with 3 additions and 0 deletions
@@ -4,6 +4,9 @@ on:
  push:
    branches:
      - master
+  pull_request:
+    types:
+      - synchronize
 jobs:
  triage:
    runs-on: ubuntu-latest