Make more robust and activate for v25 PR, E2A-Test.yml

.github/workflows/E2A-Test.yml

@@ -10,6 +10,7 @@ on:
   pull_request:
     branches:
       - main
+      - v25
     types:
       - opened
       - synchronize
@@ -112,7 +113,17 @@ jobs:
             # Merge PR source
             if ! git merge --no-ff --no-edit "origin/$HEAD_REF"; then
               echo "❌ Merge conflict simulating PR merge"
-              exit 1
+              echo "❌ Initial merge failed, attempting cleanup of __pycache__ and retry..."
+
+              # Remove known __pycache__ dirs that may cause conflict
+              echo "==> Cleaning up untracked files like __pycache__"
+              git clean -ffd lib/
+
+              # Retry the merge
+              if ! git merge --no-ff --no-edit "origin/$HEAD_REF"; then
+                echo "❌ Merge still failed after cleanup"
+                exit 1
+              fi
             fi
           else
             echo "==> Not a PR: checking out triggered commit directly"