diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 58b36e7d8..77571e44a 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -87,7 +87,7 @@ jobs: git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.SITECORE_REPO }}.git cd migration-tool-sitecore git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} - git pull origin ${{ env.BRANCH }} + git pull --rebase origin ${{ env.BRANCH }} # Cleanup step to remove unused or deleted file references echo "Cleaning up unused or deleted file references..." @@ -183,7 +183,7 @@ jobs: git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.CONTENTFUL_REPO }}.git cd migration-tool-contentful git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} - git pull origin ${{ env.BRANCH }} + git pull --rebase origin ${{ env.BRANCH }} # Cleanup step to remove unused or deleted file references echo "Cleaning up unused or deleted file references..." @@ -288,7 +288,7 @@ jobs: git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.WORDPRESS_REPO }}.git cd migration-tool-wordpress git checkout -b sync-from-migration-v2-${{ github.event.pull_request.number }} - git pull origin ${{ env.BRANCH }} + git pull --rebase origin ${{ env.BRANCH }} # Cleanup step to remove unused or deleted file references echo "Cleaning up unused or deleted file references..." diff --git a/api/src/services/sitecore.service.ts b/api/src/services/sitecore.service.ts index 24757e6a7..539291442 100644 --- a/api/src/services/sitecore.service.ts +++ b/api/src/services/sitecore.service.ts @@ -13,7 +13,6 @@ import { getLogMessage } from '../utils/index.js'; import customLogger from '../utils/custom-logger.utils.js'; import { getSafePath } from '../utils/sanitize-path.utils.js'; - const append = 'a'; const baseDirName = MIGRATION_DATA_CONFIG.DATA; const {