paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

dependencies: Switch to pnpm.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2023-03-20 11:52:59 -07:00
committed by Tim Abbott
parent b3f9fdf99a
commit 3a27b12a7d
31 changed files with 12314 additions and 12310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/git/zulip-tools.md
View File

@@ -160,18 +160,18 @@ $ tools/clean-branches --reviews
Deleting local branch review-original-5156 (was 5a1e982)
```
## Merge conflict on yarn.lock file
## Merge conflict on `pnpm-lock.yaml` file
If there is a merge conflict on yarn.lock, yarn should be run to
regenerate the file. _Important_ don't delete the yarn.lock file. Check out the
latest one from `origin/main` so that yarn knows the previous asset versions.
If there is a merge conflict on `pnpm-lock.yaml`, pnpm should be run to
regenerate the file. _Important:_ don't delete the `pnpm-lock.yaml` file. Check out the
latest one from `origin/main` so that pnpm knows the previous asset versions.
Run the following commands
```bash
git checkout origin/main -- yarn.lock
yarn install
git add yarn.lock
git checkout origin/main -- pnpm-lock.yaml
pnpm install
git add pnpm-lock.yaml
git rebase --continue
```