Manu [tennox] 3a85fd077c #6542 Apply flake templates partially on conflicts ... Will still exit with non-zero exit code and clearly prompt which files to merge: ``` nixx flake init -t github:numtide/devshell wrote: /home/manu/dev/stuff/gopassbridge/.envrc refusing to overwrite existing file '/home/manu/dev/stuff/gopassbridge/.gitignore' -> merge manually with '/nix/store/ksmwhyghjwb4d9dw6hcpbvng1msdvjim-source/template/.gitignore' wrote: /home/manu/dev/stuff/gopassbridge/devshell.toml wrote: /home/manu/dev/stuff/gopassbridge/flake.nix error: Encountered 1 conflicts - please merge manually ```		2022-06-21 17:37:02 +01:00
..
build-remote	Generalize DerivationType in preparation for impure derivations	2022-03-18 14:59:56 +00:00
libcmd	resolve redundant priority passing, wrap NixInt in eval-cache variant	2022-05-16 15:17:35 +02:00
libexpr	Merge pull request #6544 from ncfavier/getFlake-no-write-lock-file	2022-05-18 16:41:13 +02:00
libfetchers	fix GitHub URL template	2022-05-12 00:56:39 +02:00
libmain	Avoid fmt when constructor already does it	2022-04-19 01:44:11 +00:00
libstore	change priority conflict message	2022-05-16 16:16:06 +02:00
libutil	Fix the parsing of the sourcehut refs file	2022-05-04 14:38:59 +02:00
nix	#6542 Apply flake templates partially on conflicts	2022-06-21 17:37:02 +01:00
nix-build	Stop the logger properly in legacy commands	2022-05-11 12:58:45 +02:00
nix-channel	Fix segfault in headerCallback()	2022-03-03 11:11:16 +01:00
nix-collect-garbage	Deduplicate the Store downcasting with a template	2022-03-11 13:32:33 +00:00
nix-copy-closure	copyPaths: Pass store by reference	2021-07-22 09:59:51 +02:00
nix-env	Stop the logger properly in legacy commands	2022-05-11 12:58:45 +02:00
nix-instantiate	store Symbols in a table as well, like positions	2022-04-21 21:56:31 +02:00
nix-store	Stop the logger properly in legacy commands	2022-05-11 12:58:45 +02:00
resolve-system-dependencies	Get rid of most .at calls (#6393)	2022-05-04 07:44:32 +02:00
toml11	Replace cpptoml with toml11	2021-12-17 22:03:33 +01:00