Changing auto merge command to merge strategy instead of squash

.changeset/eighty-nails-peel.md

@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add volume slider in settings and change sound effects to only trigger when user intervention is required, an error occurs, or a task is completed.

.changeset/shaggy-moons-dance.md

@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix lint errors and change npm run lint to also run on webview-ui

.github/workflows/changeset-release.yml

@@ -86,6 +86,6 @@ jobs:
 
       # Enable auto-merge for the PR
       - name: Enable automerge on PR
-        run: gh pr merge --squash --auto ${{ github.event.pull_request.number }}
+        run: gh pr merge --merge --auto ${{ github.event.pull_request.number }}
         env:
           GH_TOKEN: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}

.github/workflows/marketplace-publish.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   publish-extension:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'R00-B0T'}}
+    if: ${{ github.actor == 'R00-B0T' || github.event_name == 'workflow_dispatch' }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

.github/workflows/temp-marketplace-publish.yml

@@ -1,31 +0,0 @@
-name: Publish Extension Temporary
-on:
-  push:
-    branches: ["main"]
-  workflow_dispatch:
-
-jobs:
-  publish-extension:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-      - name: Install Dependencies
-        run: |
-          npm install -g vsce ovsx
-          npm install
-          cd webview-ui
-          npm install
-          cd ..
-      - name: Package and Publish Extension
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_PAT }}
-        run: |
-          current_package_version=$(node -p "require('./package.json').version")
-          npm run publish:marketplace
-          echo "Successfully published version $current_package_version to VS Code Marketplace"