action: update sync
This commit is contained in:
parent
dff54464c6
commit
f6f8f27668
1 changed files with 2 additions and 1 deletions
|
@ -34,7 +34,8 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git checkout origin/Alpha -b android-real
|
git checkout origin/Alpha -b android-real
|
||||||
git rebase origin/android-open
|
git merge --squash origin/android-open
|
||||||
|
git commit -m "Android: patch"
|
||||||
|
|
||||||
- name: Check for conflicts
|
- name: Check for conflicts
|
||||||
run: |
|
run: |
|
||||||
|
|
Loading…
Reference in a new issue