Skip to content

Commit 83f2d51

Browse files
authored
add auto rebase for flex-pcb-fix branch
1 parent 039cd92 commit 83f2d51

1 file changed

Lines changed: 30 additions & 0 deletions

File tree

.github/workflows/auto_rebase.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Auto Rebase flex-pcb-fix on main update
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
rebase-flex-pcb-fix:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0 # Important for rebase
17+
18+
- name: Set up Git
19+
run: |
20+
git config user.name "GitHub Actions"
21+
git config user.email "[email protected]"
22+
23+
- name: Fetch all branches
24+
run: git fetch --all
25+
26+
- name: Rebase flex-pcb-fix onto main
27+
run: |
28+
git checkout flex-pcb-fix
29+
git rebase origin/main || echo "❌ Rebase failed on 'flex-pcb-fix' due to conflicts. Manual intervention required."
30+
git push --force-with-lease origin flex-pcb-fix

0 commit comments

Comments
 (0)