From a02235f20430f89fafb845b7ba6bd47a39149f54 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Mon, 29 Sep 2025 15:30:50 +0200 Subject: [PATCH] Update merge configurations for release branches --- .config/service-branch-merge.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json index 3b63f58b0cc..3f573ae3cc1 100644 --- a/.config/service-branch-merge.json +++ b/.config/service-branch-merge.json @@ -10,6 +10,10 @@ "ExtraSwitches": "-QuietComments" }, "release/dev17.14": { + "MergeToBranch": "release/dev18.0", + "ExtraSwitches": "-QuietComments" + }, + "release/dev18.0": { "MergeToBranch": "main", "ExtraSwitches": "-QuietComments" }