Merge pull request #85 from catenax-ng/fix/branch-sync-action

Fix/branch sync action
eclipse-tractusx · Jan 10, 2023 · 9a0c86a · 9a0c86a
2 parents 715e8c5 + d8ea008
commit 9a0c86a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/synch-env-branch.yml b/.github/workflows/synch-env-branch.yml
@@ -21,7 +21,8 @@ jobs:
  git config user.email github-actions@github.com
  git fetch --no-tags --progress
  git checkout --progress -b catena-x-environments origin/catena-x-environments
- git merge origin/main --allow-unrelated-histories
+ git fetch origin --recurse-submodules=no --progress --prune
+ git merge origin/main -v --allow-unrelated-histories
  git push
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}