Fix merge driver to properly handle Git merge protocol

Co-authored-by: huangyiirene <[email protected]>

Author: Copilot

.github/workflows/deploy-docs.yml

@@ -31,7 +31,7 @@ jobs:
           # Configure custom merge driver for pnpm-lock.yaml
           git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver"
           git config merge.pnpm-merge.driver \
-            "pnpm install --no-frozen-lockfile"
+            "pnpm install --no-frozen-lockfile && cp pnpm-lock.yaml %A"
 
           # Apply merge driver (CI-only, doesn't affect repository)
           echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
           # Configure custom merge driver for pnpm-lock.yaml
           git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver"
           git config merge.pnpm-merge.driver \
-            "pnpm install --no-frozen-lockfile"
+            "pnpm install --no-frozen-lockfile && cp pnpm-lock.yaml %A"
 
           # Apply merge driver (CI-only, doesn't affect repository)
           echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
           # Configure custom merge driver for pnpm-lock.yaml
           git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver"
           git config merge.pnpm-merge.driver \
-            "pnpm install --no-frozen-lockfile"
+            "pnpm install --no-frozen-lockfile && cp pnpm-lock.yaml %A"
 
           # Apply merge driver (CI-only, doesn't affect repository)
           echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes