From 70d5abe19aaeb2182bb2a48b0c520a6a67250340 Mon Sep 17 00:00:00 2001 From: KUGA2 <10581931+KUGA2@users.noreply.github.com> Date: Tue, 19 Nov 2024 15:35:52 +0100 Subject: [PATCH 1/6] Update config precedence - Add possible options for global config - State that the order is the precedence order - Fix order --- docs/usage/config-overview.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index 99d6b40c96a26f..39001388ca52a0 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -4,9 +4,14 @@ When Renovate runs on a repository, the final config used is derived from the: - Default config - Global config + - File config + - Environment config + - CLI config - Inherited config -- Repository config - Resolved presets referenced in config +- Repository config + +This order is the order of precedence. Later configuration overwrites or merges with previous ones, depending whether the element is marked as mergable. !!! note From 9b4db3ac113e5df2770a614e9a862e91111b2451 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Tue, 19 Nov 2024 17:29:11 +0100 Subject: [PATCH 2/6] Update docs/usage/config-overview.md --- docs/usage/config-overview.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index 39001388ca52a0..45172d0751e574 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -11,7 +11,8 @@ When Renovate runs on a repository, the final config used is derived from the: - Resolved presets referenced in config - Repository config -This order is the order of precedence. Later configuration overwrites or merges with previous ones, depending whether the element is marked as mergable. +The above is the order of precedence. +Later configuration overwrites or merges with earlierones, depending whether the element is marked as "mergeable". !!! note From 15cf1eb18c76f845937078a57bc5224fdc30a823 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 20 Nov 2024 20:06:32 +0100 Subject: [PATCH 3/6] Update docs/usage/config-overview.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Birger J. Nordølum --- docs/usage/config-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index 45172d0751e574..9f9a57c8951dd3 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -12,7 +12,7 @@ When Renovate runs on a repository, the final config used is derived from the: - Repository config The above is the order of precedence. -Later configuration overwrites or merges with earlierones, depending whether the element is marked as "mergeable". +Later configuration overwrites or merges with earlier ones, depending whether the element is marked as "mergeable". !!! note From 57aeb6cdb45ab5e894ab3fa79ab6daf2dc8a48d2 Mon Sep 17 00:00:00 2001 From: KUGA2 <10581931+KUGA2@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:49:10 +0100 Subject: [PATCH 4/6] Apply PR suggestions --- docs/usage/config-overview.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index 9f9a57c8951dd3..c24567ab80c326 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -1,18 +1,17 @@ # Renovate configuration overview -When Renovate runs on a repository, the final config used is derived from the: - -- Default config -- Global config - - File config - - Environment config - - CLI config -- Inherited config -- Resolved presets referenced in config -- Repository config - -The above is the order of precedence. -Later configuration overwrites or merges with earlier ones, depending whether the element is marked as "mergeable". +When Renovate runs on a repository, the final config used is derived from the following config locations. The below is the order of precedence: + +1. Default config +2. Global config +2.1 File config +2.2 Environment config +2.3 CLI config +3. Inherited config +4. Resolved presets referenced in config +5. Repository config + +Items with a higher number override items that have lower numbers. If the item has the mergeable property, it will merge with lower numbers instead. !!! note From 21c665d5065acaea2d167cf8a21fb2b31764d1fb Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 27 Nov 2024 12:05:30 +0100 Subject: [PATCH 5/6] Update docs/usage/config-overview.md Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- docs/usage/config-overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index c24567ab80c326..d48eb55ca84b46 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -4,9 +4,9 @@ When Renovate runs on a repository, the final config used is derived from the fo 1. Default config 2. Global config -2.1 File config -2.2 Environment config -2.3 CLI config + 2.1 File config + 2.2 Environment config + 2.3 CLI config 3. Inherited config 4. Resolved presets referenced in config 5. Repository config From 6b433e779d30a8db1a11b2b2622f04e7ed7db9a4 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Wed, 27 Nov 2024 12:05:50 +0100 Subject: [PATCH 6/6] Update docs/usage/config-overview.md Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> --- docs/usage/config-overview.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/usage/config-overview.md b/docs/usage/config-overview.md index d48eb55ca84b46..5638a014bd2da2 100644 --- a/docs/usage/config-overview.md +++ b/docs/usage/config-overview.md @@ -11,7 +11,8 @@ When Renovate runs on a repository, the final config used is derived from the fo 4. Resolved presets referenced in config 5. Repository config -Items with a higher number override items that have lower numbers. If the item has the mergeable property, it will merge with lower numbers instead. +Items with a higher number override items that have lower numbers. +If the item has the `mergeable` property, it will merge with lower numbers instead. !!! note