fix: pull rebase

Decathlon · Dec 10, 2021 · 321892d · 321892d
1 parent b090573
commit 321892d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-api.yaml b/.github/workflows/build-api.yaml
@@ -76,7 +76,7 @@ jobs:
         run: |
           cat << EOF > .git/hooks/pre-push
           #!/bin/bash
-          git pull
+          git pull --rebase
           EOF
           chmod +x .git/hooks/pre-push
 

diff --git a/.github/workflows/build-web-ui.yaml b/.github/workflows/build-web-ui.yaml
@@ -58,7 +58,7 @@ jobs:
         run: |
           cat << EOF > .git/hooks/pre-push
           #!/bin/bash
-          git pull
+          git pull --rebase
           EOF
           chmod +x .git/hooks/pre-push