imp: advise removal of */modules-list.nix on merge conflicts

During merge conflicts, these lines should appear in the hunks and give instructions on how to handle them in the face of the implementation of `rakeLeaves` for modules in https://git.io/JB1Wk via `importModules`, that knows how to rake leaves by walking the folder tree on it's own and collecting leaves that are normal nix files or folers who contain a `default.nix` mmicking strongly a "recursive" import-ish syntax.
divnix · Aug 1, 2021 · 5bd943f · 5bd943f
1 parent 73431f5
commit 5bd943f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/modules/module-list.nix b/modules/module-list.nix
@@ -1 +1,2 @@
+# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
 [ ]
diff --git a/users/modules/module-list.nix b/users/modules/module-list.nix
@@ -1 +1,2 @@
+# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
 [ ]