Skip to content

pnpm/merge-driver

This branch is 1 commit ahead of master.

Folders and files

NameName
Last commit message
Last commit date
Nov 1, 2020
Nov 1, 2020
Apr 5, 2018
Apr 5, 2018
Apr 5, 2018
Nov 1, 2020
Apr 5, 2018
Nov 26, 2019
Oct 29, 2020
Feb 23, 2023
Oct 29, 2020
Aug 3, 2023
Oct 19, 2023
Nov 1, 2020
Apr 5, 2018
Oct 29, 2020
Apr 5, 2018

Repository files navigation

@pnpm/merge-driver

A merge driver for pnpm-lock.yaml

npm version Build Status

Installation

Globally ( recommended )

pnpm add -g @pnpm/merge-driver

Locally in a repository ( this will not help you if you need to do a rebase/merge right now ! )

pnpm add -D @pnpm/merge-driver

Usage

To configure it on a repo, run:

pnpm add -g @pnpm/merge-driver
pnpm dlx npm-merge-driver install --driver-name pnpm-merge-driver --driver "pnpm-merge-driver %A %O %B %P" --files pnpm-lock.yaml

License

MIT © Zoltan Kochan