From aa062d26bed12b320cbacf92ee805906df3c56da Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Fri, 22 Jul 2022 12:31:12 -0500 Subject: [PATCH] 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 --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) 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