all repos — nixfiles @ bf6df500236728a550d5072b25509520d07ea03e

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

git: don't auto-merge npm lockfile conflicts

`npm install` will perform this process anyway
Alan Pearce alan@alanpearce.eu
Tue, 18 May 2021 20:12:46 +0200
commit

bf6df500236728a550d5072b25509520d07ea03e

parent

0d60b154cc82b17fb9d3a888db3a76b913134b70

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

jump to
M user/settings/git.nix → user/settings/git.nix
@@ -47,10 +47,6 @@ };       "difftool.sopsdiffer" = {
         textconf = "${pkgs.sops}/bin/sops -d";
       };
-      "merge.npm-merge-driver" = {
-        name = "automatically merge npm lockfiles";
-        driver = "${pkgs.node2nixPackages."npm-merge-driver"}/bin/npm-merge-driver merge %A %O %B %P";
-      };
       remote = {
         autoSetupMerge = true;
       };