Merge pull request #80 from rootstrap/feat/add_workflow_for_checking_unresolved_conflicts

feat: add workflow for checking unresolved conflicts

Author: asdolo

.github/workflows/check-merge-conflicts.yml

@@ -0,0 +1,27 @@
+# 🔗 Links:
+# Source file: https://github.com/rootstrap/react-native-template/blob/master/.github/workflows/check-merge-conflicts.yml
+
+# ✍️ Description:
+# This action is used to check for merge conflicts.
+# Runs on any pull request, and also when pushing to main/master
+
+# 🚨 GITHUB SECRETS REQUIRED: NONE
+
+name: Check for merge conflicts
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  check-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📦 Checkout project repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Check for merge conflicts
+        uses: olivernybroe/[email protected]