Update sync-branches.yml
This commit is contained in:
parent
d1e8e8dcb4
commit
74dd1cb62d
2
.github/workflows/sync-branches.yml
vendored
2
.github/workflows/sync-branches.yml
vendored
@ -47,6 +47,7 @@ jobs:
|
|||||||
- name: Create and push FrogPilot branch
|
- name: Create and push FrogPilot branch
|
||||||
run: |
|
run: |
|
||||||
git checkout -b FrogPilot frogai/FrogPilot
|
git checkout -b FrogPilot frogai/FrogPilot
|
||||||
|
git pull --rebase origin FrogPilot || echo "No changes to pull"
|
||||||
git push origin FrogPilot
|
git push origin FrogPilot
|
||||||
|
|
||||||
- name: Delete conflicting branch FrogPilot-Development if it exists
|
- name: Delete conflicting branch FrogPilot-Development if it exists
|
||||||
@ -56,4 +57,5 @@ jobs:
|
|||||||
- name: Create and push FrogPilot-Development branch
|
- name: Create and push FrogPilot-Development branch
|
||||||
run: |
|
run: |
|
||||||
git checkout -b FrogPilot-Development frogai/FrogPilot-Development
|
git checkout -b FrogPilot-Development frogai/FrogPilot-Development
|
||||||
|
git pull --rebase origin FrogPilot-Development || echo "No changes to pull"
|
||||||
git push origin FrogPilot-Development
|
git push origin FrogPilot-Development
|
||||||
|
Loading…
x
Reference in New Issue
Block a user