Skip to content

rebase #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RohitKini merged 1 commit into from
Apr 24, 2025
Merged

rebase #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/repo-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down Expand Up @@ -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..."
Expand Down Expand Up @@ -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..."
Expand Down
1 change: 0 additions & 1 deletion api/src/services/sitecore.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading