From 452ffe5464f20ac44a01c536349895d138150a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <7226587+thufschmitt@users.noreply.github.com>
Date: Wed, 18 May 2022 16:46:13 +0200
Subject: [PATCH] Hint at the source file on conflict in `flake new`

Add a pointer to the source file (from the template) when `nix flake new` (or `init`) encounters an already existing file

Fix #6542
---
 src/nix/flake.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 1938ce4e6..a1edb5dbf 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -758,7 +758,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
                     if (pathExists(to2)) {
                         auto contents2 = readFile(to2);
                         if (contents != contents2)
-                            throw Error("refusing to overwrite existing file '%s'", to2);
+                            throw Error("refusing to overwrite existing file '%s' - please merge manually with '%s'", to2, from2);
                     } else
                         writeFile(to2, contents);
                 }
@@ -766,7 +766,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
                     auto target = readLink(from2);
                     if (pathExists(to2)) {
                         if (readLink(to2) != target)
-                            throw Error("refusing to overwrite existing symlink '%s'", to2);
+                            throw Error("refusing to overwrite existing symlink '%s' - please merge manually with '%s'", to2, from2);
                     } else
                           createSymlink(target, to2);
                 }