Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/check-merge-conflicts.yml
Original file line number Diff line number Diff line change
@@ -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