diff --git a/.github/workflows/check-merge-conflicts.yml b/.github/workflows/check-merge-conflicts.yml new file mode 100644 index 000000000..59b6f6a55 --- /dev/null +++ b/.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/action-conflict-finder@v4.0