https://github.com/pnpm/merge-driver

A merge driver for pnpm-lock.yaml
https://github.com/pnpm/merge-driver

Last synced: 16 days ago
JSON representation

A merge driver for pnpm-lock.yaml

• Host: GitHub
• URL: https://github.com/pnpm/merge-driver
• Owner: pnpm
• License: mit
• Created: 2018-04-04T19:25:28.000Z (about 7 years ago)
• Default Branch: master
• Last Pushed: 2023-10-19T12:12:38.000Z (over 1 year ago)
• Last Synced: 2024-10-30T00:54:52.279Z (8 months ago)
• Language: TypeScript
• Homepage:
• Size: 826 KB
• Stars: 16
• Watchers: 20
• Forks: 2
• Open Issues: 19
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# @pnpm/merge-driver

> A merge driver for pnpm-lock.yaml

[![npm version](https://img.shields.io/npm/v/@pnpm/merge-driver.svg)](https://www.npmjs.com/package/@pnpm/merge-driver) [![Build Status](https://img.shields.io/travis/pnpm/merge-driver/master.svg)](https://travis-ci.org/pnpm/merge-driver)

## Installation

Globally ( recommended )

```sh

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 ! )

```sh

pnpm add -D @pnpm/merge-driver

```

## Usage

To configure it on a repo, run:

```sh

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](./LICENSE) © [Zoltan Kochan](https://www.kochan.io/)