summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2021-05-18 20:12:46 +0200
committerAlan Pearce2021-05-18 20:12:46 +0200
commitbf6df500236728a550d5072b25509520d07ea03e (patch)
treefe556be22c0cb30086a780a3c580480be4d97893
parent0d60b154cc82b17fb9d3a888db3a76b913134b70 (diff)
downloadnixfiles-bf6df500236728a550d5072b25509520d07ea03e.tar.xz
nixfiles-bf6df500236728a550d5072b25509520d07ea03e.zip
git: don't auto-merge npm lockfile conflicts
`npm install` will perform this process anyway
-rw-r--r--user/settings/git.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix index 54ef3f7e..f52f198d 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix
@@ -47,10 +47,6 @@
47 "difftool.sopsdiffer" = { 47 "difftool.sopsdiffer" = {
48 textconf = "${pkgs.sops}/bin/sops -d"; 48 textconf = "${pkgs.sops}/bin/sops -d";
49 }; 49 };
50 "merge.npm-merge-driver" = {
51 name = "automatically merge npm lockfiles";
52 driver = "${pkgs.node2nixPackages."npm-merge-driver"}/bin/npm-merge-driver merge %A %O %B %P";
53 };
54 remote = { 50 remote = {
55 autoSetupMerge = true; 51 autoSetupMerge = true;
56 }; 52 };