diff options
| author | Alan Pearce | 2021-05-18 20:12:46 +0200 |
|---|---|---|
| committer | Alan Pearce | 2021-05-18 20:12:46 +0200 |
| commit | bf6df500236728a550d5072b25509520d07ea03e (patch) | |
| tree | fe556be22c0cb30086a780a3c580480be4d97893 /user/settings | |
| parent | 0d60b154cc82b17fb9d3a888db3a76b913134b70 (diff) | |
| download | nixfiles-bf6df500236728a550d5072b25509520d07ea03e.tar.lz nixfiles-bf6df500236728a550d5072b25509520d07ea03e.tar.zst nixfiles-bf6df500236728a550d5072b25509520d07ea03e.zip | |
git: don't auto-merge npm lockfile conflicts
`npm install` will perform this process anyway
Diffstat (limited to 'user/settings')
| -rw-r--r-- | user/settings/git.nix | 4 |
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 @@ "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; }; |