Merge pull request #242 from ferferga/patch-1

Run merge conflict check on PR rebase/commit
jellyfin · Mar 24, 2021 · e88e264 · e88e264
2 parents 9e82d3d + d66e6e2
commit e88e264
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml
@@ -4,6 +4,9 @@ on:
  push:
  branches:
  - master
+ pull_request:
+ types:
+ - synchronize
 jobs:
  triage:
  runs-on: ubuntu-latest