change .gitlab-ci.yml

.gitlab-ci.yml

@@ -3,14 +3,16 @@ merge-to-branches:
     - auto-merge
   stage: deploy
   script:
-    - git config --global user.email "tuna@onschool.edu.vn"
-    - git config --global user.name "tuna"
+    - git config user.email "tuna@onschool.edu.vn"
+    - git config user.name "tuna"
+
+    - git fetch --all
 
     - $MERGE_COMMIT = git log -1 --pretty=%B | Select-String -Pattern 'merge'
     - if ($MERGE_COMMIT) {
       foreach ($branch in @('staging/a', 'staging/b')) {
       git checkout $branch
-      git merge main
+      git merge origin/main
       git push https://oauth2:$env:GITLAB_TOKEN@gitlab.com/tuna/tech-7260.git $branch
       }
       }