Skip to content
This repository was archived by the owner on Aug 22, 2025. It is now read-only.

Commit b97b52d

Browse files
committed
automerge
1 parent a7fd3d3 commit b97b52d

1 file changed

Lines changed: 34 additions & 0 deletions

File tree

.github/workflows/auto-merge.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Auto Merge
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
auto-merge:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v2
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v2
17+
with:
18+
node-version: '14'
19+
20+
- name: Install dependencies
21+
run: npm install
22+
23+
- name: Check for merge conflicts
24+
run: |
25+
git fetch origin main
26+
git checkout -b temp-branch
27+
git merge origin/main --no-commit --no-ff || exit 1
28+
29+
- name: Merge pull request
30+
if: success()
31+
run: |
32+
git checkout main
33+
git merge ${{ github.event.pull_request.head.ref }}
34+
git push origin main

0 commit comments

Comments
 (0)