From 79cdd5c103d4aad1c3185cecf82893df30e60f6c Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 27 Apr 2018 18:05:51 +0200 Subject: git: add merge driver for npm lockfiles --- git/.config/git/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git/.config/git/config b/git/.config/git/config index bdf88f55..464018b5 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -48,3 +48,6 @@ [gpg] program = gpg +[merge "npm-merge-driver"] + name = automatically merge npm lockfiles + driver = npx npm-merge-driver merge %A %O %B %P -- cgit 1.4.1