resx-git-merge-driver(1) -- git merge driver for automatic merging of lockfiles

Automatic Setup (recommended):

To start using it right away:

$ npx resx-git-merge-driver install --global

Or install it locally, per-project:

$ cd /path/to/git/repository
$ npx resx-git-merge-driver install

...And you're good to go!

Advanced

The following section is only for advanced configuration of the driver if you have specific needs.

Setup Options

resx-git-merge-driver install supports a couple of config options:

--driver - string to install as the driver in the git configuration

--driver-name - string to use as the merge driver name in your configuration

--files - list of files that will trigger this driver

--no-legacy - disables retrying legacy commands on error

Merge Options

resx-git-merge-driver merge can also be configured:

-c, --command - command to execute when a lockfile is conflicted

--no-legacy - disables retrying legacy commands on error

Install as Dependency

To avoid regular npx installs, consider installing the driver:

$ npm install [-g|--save-dev] resx-git-merge-driver

Manual Setup (advanced):

resx-git-merge-driver requires two git configurations to work: a git configuration to add the driver to git, which is by default your local .git/config file, and a gitattributes(5) configuration, which is by default your local .git/info/attributes.

If you do not want resx-git-merge-driver to install itself for you:

Add the driver to .git/config:

$ git config merge."resx-git-merge-driver".name \
    "Automatically merge resx files"
$ git config merge."resx-git-merge-driver".driver \
    "npx resx-git-merge-driver merge %A %O %B %P"

Add the relevant attributes to .gitattributes or .git/info/attributes:

*.resx merge=resx-git-merge-driver

Uninstalling

To remove an installed merge driver, use resx-git-merge-driver uninstall:

$ npx resx-git-merge-driver uninstall [--global] [--driver-name=resx-git-merge-driver]

LICENSE

This work is released under the terms of the ISC license. See LICENSE.md for details.

SEE ALSO

• git-config(1)
• gitattributes(5)

Change Log

All notable changes to this project will be documented in this file. See standard-version for commit guidelines.

2.3.5 (2017-12-06)

Bug Fixes

• engines: actually remove this altogether. causes more problems than it solves (65a60aa)
• engines: Change npm engine specification to >=5. (#1) (cafda00)

2.3.4 (2017-12-05)

2.3.3 (2017-12-05)

Bug Fixes

• install: manually replace $HOME (ae40f2d)

2.3.2 (2017-12-05)

Bug Fixes

• install: be a bit smarter about adding to attributes files (a046cbc)

2.3.1 (2017-12-04)

Bug Fixes

• legacy: warn people that legacy mode might throw away some of their changes (d633205)

2.3.0 (2017-12-04)

Features

• legacy: add legacy command support (361dec7)
• log: add stderr logging (184d6ec)

2.2.0 (2017-12-03)

Features

• uninstall: add uninstaller (a42a4de)

2.1.0 (2017-12-03)

Features

• global: add --global flag for global installation (b9c131f)

2.0.1 (2017-12-03)

Bug Fixes

• merge: make sure to merge the right lockfile (09f6b25)

2.0.0 (2017-12-03)

Bug Fixes

• deps: force unbump of broken rxjs version (72dcd14)

Features

• non-npm: add support for running non-npm commands (aee4e70)

BREAKING CHANGES

• non-npm: this removes the --npm-bin option in favor of --command

1.0.2 (2017-12-03)

Bug Fixes

• deps: accidentally added devdeps to deps object (f865567)

1.0.1 (2017-12-03)

Bug Fixes

• docs: fix some badges. oops. (0cdfbfc)

1.0.0 (2017-12-03)

Features

• api: set up install and merge as separate command (76072b9)

BREAKING CHANGES

• api: This changes the install api to npm-merge-driver install [opts], and the merge api to npm-merge-driver merge <npm-bin> <current> <old> <theirs> <filename>.

0.0.0 (2017-12-02)

Bug Fixes

• merge: get merging working right (28af1f2)