all repos — nixfiles @ 79cdd5c103d4aad1c3185cecf82893df30e60f6c

System and user configuration, managed by nix and home-manager

git: add merge driver for npm lockfiles
Alan Pearce alan@alanpearce.eu
Fri, 27 Apr 2018 18:05:51 +0200
commit

79cdd5c103d4aad1c3185cecf82893df30e60f6c

parent

cb6616a19c4d49762defd3d59ebf4cba749479c2

1 files changed, 3 insertions(+), 0 deletions(-)

jump to
M git/.config/git/configgit/.config/git/config
@@ -48,3 +48,6 @@ cmd = icdiff --line-numbers $LOCAL $REMOTE [gpg]
 	program = gpg
 
+[merge "npm-merge-driver"]
+	name = automatically merge npm lockfiles
+	driver = npx npm-merge-driver merge %A %O %B %P