chore: added git merge strategy

ubiquity-os-marketplace · Jul 7, 2024 · 0e39a1a · 0e39a1a
1 parent 7612e2b
commit 0e39a1a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/compute.yml b/.github/workflows/compute.yml
@@ -47,6 +47,7 @@ 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
           git add database/sql.db
           if [ -n "$(git diff-index --cached --name-only HEAD)" ]; then
             git commit -m "chore: [skip ci] updated database" || echo "Lint-staged check failed"