Merge pull request #824 from nflondo/fix/update-action

Adding merge strategy
2023-07-11 15:01:19 -06:00 · 2023-07-11 15:01:19 -06:00 · 142e5b4c69
parent 9868b59392 804007ce87
commit 142e5b4c69
1 changed files with 2 additions and 2 deletions
--- a/.github/workflows/daily.yaml
+++ b/.github/workflows/daily.yaml
@ -52,9 +52,9 @@ jobs:
      run: |
        git config --global user.name "github-actions[bot]"
        git config --global user.email "github-actions[bot]@users.noreply.github.com"
+        git config --global pull.rebase false # merge (this is the default)
        scripts/pull-ci-scripts
-        bin/partner-charts-ci auto
-        git pull origin main-source
+        bin/partner-charts-ci auto        
        git push origin main-source
    - name: Update main branch
      run: |