Spaces:
Running
Running
Update ci.yml: git pull without --rebase
Browse files- .github/workflows/ci.yml +2 -2
.github/workflows/ci.yml
CHANGED
|
@@ -49,9 +49,9 @@ jobs:
|
|
| 49 |
- name: Pull latest changes
|
| 50 |
run: |
|
| 51 |
if [ "${{ github.event_name }}" = "pull_request" ]; then
|
| 52 |
-
git pull
|
| 53 |
else
|
| 54 |
-
git pull
|
| 55 |
fi
|
| 56 |
|
| 57 |
- name: Push changes
|
|
|
|
| 49 |
- name: Pull latest changes
|
| 50 |
run: |
|
| 51 |
if [ "${{ github.event_name }}" = "pull_request" ]; then
|
| 52 |
+
git pull origin ${{ github.event.pull_request.head.ref }}
|
| 53 |
else
|
| 54 |
+
git pull origin main
|
| 55 |
fi
|
| 56 |
|
| 57 |
- name: Push changes
|