michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add pnpm-merge-driver instructions (#4022)

Browse source 
* 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 <nate@astro.build>
This commit is contained in:
Nate Moore 2022-07-22 12:31:12 -05:00 committed by GitHub
parent 4819e7b071
commit aa062d26be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CONTRIBUTING.md
View file

@ -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