Skip to content

Commit

Permalink
Update submodules to allow unrelated histories during pull
Browse files Browse the repository at this point in the history
Previously, the script used `git config pull.rebase false` to pull the latest changes from submodules. This has been updated to use `git pull --allow-unrelated-histories` instead.

This change ensures that unrelated histories are allowed when pulling changes from the main branch of each submodule.
  • Loading branch information
zanhk committed Sep 17, 2023
1 parent 598b535 commit a2a0193
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: "Initialize and Update Submodules"
run: |
echo "Pulling latest submodules changes"
git submodule foreach 'git config pull.rebase false; git pull origin main'
git submodule foreach 'git pull --allow-unrelated-histories origin main'
- name: "cat package.json (before bump)"
run: cat ./package.json
- name: "Automated Version Bump"
Expand Down

0 comments on commit a2a0193

Please sign in to comment.