Skip to content

Commit 5bd4fb2

Browse files
committed
rebase
1 parent 00d7344 commit 5bd4fb2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/repo-sync.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.SITECORE_REPO }}.git
8888
cd migration-tool-sitecore
8989
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 }}
9191
9292
# Cleanup step to remove unused or deleted file references
9393
echo "Cleaning up unused or deleted file references..."
@@ -183,7 +183,7 @@ jobs:
183183
git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.CONTENTFUL_REPO }}.git
184184
cd migration-tool-contentful
185185
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 }}
187187
188188
# Cleanup step to remove unused or deleted file references
189189
echo "Cleaning up unused or deleted file references..."
@@ -288,7 +288,7 @@ jobs:
288288
git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/${{ env.WORDPRESS_REPO }}.git
289289
cd migration-tool-wordpress
290290
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 }}
292292
293293
# Cleanup step to remove unused or deleted file references
294294
echo "Cleaning up unused or deleted file references..."

api/src/services/sitecore.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { getLogMessage } from '../utils/index.js';
1313
import customLogger from '../utils/custom-logger.utils.js';
1414
import { getSafePath } from '../utils/sanitize-path.utils.js';
1515

16-
1716
const append = 'a';
1817
const baseDirName = MIGRATION_DATA_CONFIG.DATA;
1918
const {

0 commit comments

Comments
 (0)