Skip to content

Commit

Permalink
automerge
Browse files Browse the repository at this point in the history
  • Loading branch information
notMONGCHAW committed Jan 4, 2025
1 parent a7fd3d3 commit b97b52d
Showing 1 changed file with 34 additions and 0 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Auto Merge

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
auto-merge:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '14'

- name: Install dependencies
run: npm install

- name: Check for merge conflicts
run: |
git fetch origin main
git checkout -b temp-branch
git merge origin/main --no-commit --no-ff || exit 1
- name: Merge pull request
if: success()
run: |
git checkout main
git merge ${{ github.event.pull_request.head.ref }}
git push origin main

0 comments on commit b97b52d

Please sign in to comment.