Add pnpm-merge-driver instructions (withastro#4022)

* chore: add pnpm-merge-driver * chore: remove @pnpm/merge-driver * chore: update contributing with merge-driver instructions * Delete pnpm-lock.yaml * chore: reset pnpm-lock.yaml * chore: reset pnpm-lock.yaml Co-authored-by: Nate Moore <[email protected]>
Minearm-RPM · Jul 22, 2022 · aa062d2 · aa062d2
1 parent 4819e7b
commit aa062d2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,6 +31,13 @@ In [#2254](https://github.com/withastro/astro/pull/2254) a `.git-blame-ignore-re
 git config --local blame.ignoreRevsFile .git-blame-ignore-revs
 ```
 
+To automatically handle merge conflicts in `pnpm-lock.yaml`, you should run the following commands locally.
+
+```shell
+pnpm add -g @pnpm/merge-driver
+pnpx npm-merge-driver install --driver-name pnpm-merge-driver --driver "pnpm-merge-driver %A %O %B %P" --files pnpm-lock.yaml
+```
+
 ### Development
 
 ```shell