Обновить .gitea/workflows/automerge-with-core.yaml

.gitea/workflows/automerge-with-core.yaml

@@ -13,13 +13,11 @@ jobs:
     steps:
       - run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
       - run: git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
-      - run: |
+      - run: git clone https://sicampus.ru/gitea/${{ gitea.repository }}
-          git clone https://sicampus.ru/gitea/${{ gitea.repository }}
+      - run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
-          git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
+      - run: git fetch upstream
-          git fetch upstream
+      - run: git rebase upstream/main
-          git rebase upstream/main
+      - run: git log
-          git log
-          echo "OK"
       - run: |
           echo "From other line"
           git log