-
Notifications
You must be signed in to change notification settings - Fork 0
44 lines (37 loc) · 1.11 KB
/
auto-merge.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
name: Auto Merge Frontend/Backend to Main
on:
push:
branches:
- frontend
- backend
jobs:
merge-to-main:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
with:
ref: ${{ github.event.ref }}
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
- name: Set up Git
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
- name: Merge to main
id: merge
run: |
git fetch origin main
git checkout main
git merge --no-ff --allow-unrelated-histories ${{ github.event.ref }} || echo "Merge conflict detected" > conflict.txt
- name: Check for conflicts
if: failure()
run: |
cat conflict.txt
exit 1
- name: Push changes to main
if: success()
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: |
git push https://[email protected]/Md-Rubel-Ahmed-Rana/Team-Management-App.git main