Merge pull request #7 from objectstack-ai/copilot/configure-pnpm-merge-driver

huangyiirene · web-flow · commit ff601d777b24 · 2026-01-15T20:12:43.000+08:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+pnpm-lock.yaml merge=pnpm-merge
diff --git a/README.md b/README.md
@@ -18,6 +18,15 @@ A multi-language documentation site built with Fumadocs, supporting English and
 npm install
 ```
 
+After cloning the repository, configure the Git merge driver for `pnpm-lock.yaml`:
+
+```bash
+git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver"
+git config merge.pnpm-merge.driver "pnpm install"
+```
+
+This helps avoid merge conflicts in the lock file by automatically regenerating it during merges.
+
 ### Development
 
 ```bash
