From 452271bcae38ac894cc860f43a899ccfba30f63b Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Wed, 6 Nov 2024 23:25:18 +0100 Subject: [PATCH] precedence doc for #443 --- CONTRIBUTING.md | 4 ++++ docs/config/config-config.md | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d3bc03e..003e5001 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,6 +103,10 @@ levels in not accurate anymore. * Profile `(dyn)variables` > profile's included `(dyn)variables` * Imported `variables`/`dynvariables` > `(dyn)variables` +When `import_configs` importing config's elements except the `(dyn)variables` +will take precedence in case of name clash +(see ). + ## Variable resolution How variables are resolved (through Jinja2's diff --git a/docs/config/config-config.md b/docs/config/config-config.md index 350ec74a..2368dcf8 100644 --- a/docs/config/config-config.md +++ b/docs/config/config-config.md @@ -187,6 +187,10 @@ import_configs: - other-config.yaml:optional ``` +In case of a name clash (same name in importing and imported configs), +the importing config will take precedence except for the `variables` and `dynvariables` +(see [variable](config-file.md#variables) and [CONTRIBUTING doc](/CONTRIBUTING.md)). + ## default_actions entry Dotdrop allows to execute an action for any dotfile installation. These actions work as any other action (`pre` or `post`). @@ -223,4 +227,4 @@ Note: * directories will **not** be backed up, only files * when using a different `link` value than `nolink` with directories, the files under the directory will **not** be backed up - (See [Symlinking dotfiles](config-file.md#symlinking-dotfiles)), \ No newline at end of file + (See [Symlinking dotfiles](config-file.md#symlinking-dotfiles)),