From d66e6e2fe1530d205fa327bf86e0be30e5774f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= <ferferga@hotmail.com>
Date: Wed, 24 Mar 2021 00:48:34 +0100
Subject: [PATCH] Run merge conflict check on PR rebase/commit

---
 .github/workflows/merge-conflicts.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml
index 8f07acd6f..2f5287a55 100644
--- 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