diff options
| author |  Nate Moore <natemoo-re@users.noreply.github.com>
| 2022-07-22 12:31:12 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-07-22 12:31:12 -0500 |
| commit | aa062d26bed12b320cbacf92ee805906df3c56da (patch) | |
| tree | 9596ccb211b832405be9d9d257d28252be3bd086 | |
| parent | 4819e7b071b20911dbb16b0701138655ef97cd62 (diff) | |
| download | astro-aa062d26bed12b320cbacf92ee805906df3c56da.tar.gz astro-aa062d26bed12b320cbacf92ee805906df3c56da.tar.zst astro-aa062d26bed12b320cbacf92ee805906df3c56da.zip | |
Add `pnpm-merge-driver` instructions (#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 <nate@astro.build>
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTING.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2bc061988..3d99e1fa5 100644 --- 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 |