automation: sync main to earlgrey-hwe

Signed-off-by: Chris Frantz <cfrantz@google.com>

.github/workflows/sync-main-to-earlgrey-hwe.yml

diff --git a/.github/workflows/sync-main-to-earlgrey-hwe.yml b/.github/workflows/sync-main-to-earlgrey-hwe.yml
index ed481b0..ee3164c 100644
--- a/.github/workflows/sync-main-to-earlgrey-hwe.yml
+++ b/.github/workflows/sync-main-to-earlgrey-hwe.yml
@@ -1,4 +1,4 @@
-name: Scheduled Sync Main to Earlgrey HWE
+name: Sync main into earlgrey-hwe
 
 on:
   schedule:
@@ -10,23 +10,12 @@
   create-pull-request:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the earlgrey-hwe branch
+      - name: Checkout the main branch
         uses: actions/checkout@v6
         with:
-          ref: earlgrey-hwe
+          ref: main
           fetch-depth: 0 # Fetches all history so branches can be compared
 
-      - name: Merge main into earlgrey-hwe
-        run: |
-          git config --global user.name 'synchronize-bot[bot]'
-          git config --global user.email 'synchronize[bot]@users.noreply.github.com'
-
-          # Fetch the latest main branch
-          git fetch origin main:main
-
-          # Merge main into the currently checked-out dev branch
-          git merge main --no-commit --no-ff || echo "Conflicts found; resolve in the PR."
-
       - name: Generate GitHub App Token
         id: generate-token
         uses: actions/create-github-app-token@v3
@@ -38,8 +27,8 @@
         uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          branch: automation/sync-main-to-earlgrey-hwe
           base: earlgrey-hwe
+          branch: sync/main-to-earlgrey-hwe
           title: 'chore: sync main into earlgrey hwe'
           reviewers: cfrantz, moidx
           body: |