Debugging

.github/workflows/Update-Version-and-create-Realeases-PR.yml

@@ -30,8 +30,8 @@ jobs:
           node-version: 18
       - name: Setup Git
         run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
       - name: Update the version
         id: update_version
         run: |
@@ -41,6 +41,10 @@ jobs:
         run: |
           npm install -g auto-changelog
           auto-changelog -v ${{ steps.update_version.outputs.version }}
+      - name: Handle merge conflicts
+        run: |
+          git fetch origin main
+          git merge origin/main --strategy-option ours || true
       - name: Create pull request
         id: create_pr
         uses: peter-evans/create-pull-request@v7
@@ -50,5 +54,3 @@ jobs:
           title: "Release: Candidate Version ${{ steps.update_version.outputs.version }} Pull Request"
           body: "This pull request contains the updated __version__.py file with the new release version"
           base: main
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1