|
87 | 87 | git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.SITECORE_REPO }}.git |
88 | 88 | cd migration-tool-sitecore |
89 | 89 | git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} |
90 | | - git pull origin ${{ env.BRANCH }} |
| 90 | + git pull --rebase origin ${{ env.BRANCH }} |
91 | 91 |
|
92 | 92 | # Cleanup step to remove unused or deleted file references |
93 | 93 | echo "Cleaning up unused or deleted file references..." |
@@ -183,7 +183,7 @@ jobs: |
183 | 183 | git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.CONTENTFUL_REPO }}.git |
184 | 184 | cd migration-tool-contentful |
185 | 185 | git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} |
186 | | - git pull origin ${{ env.BRANCH }} |
| 186 | + git pull --rebase origin ${{ env.BRANCH }} |
187 | 187 |
|
188 | 188 | # Cleanup step to remove unused or deleted file references |
189 | 189 | echo "Cleaning up unused or deleted file references..." |
@@ -288,7 +288,7 @@ jobs: |
288 | 288 | git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.WORDPRESS_REPO }}.git |
289 | 289 | cd migration-tool-wordpress |
290 | 290 | git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} |
291 | | - git pull origin ${{ env.BRANCH }} |
| 291 | + git pull --rebase origin ${{ env.BRANCH }} |
292 | 292 |
|
293 | 293 | # Cleanup step to remove unused or deleted file references |
294 | 294 | echo "Cleaning up unused or deleted file references..." |
|
0 commit comments