From 427cc188611560c039af313ca0114435f22afeb5 Mon Sep 17 00:00:00 2001 From: "jhr2hi@bosch.com" Date: Mon, 11 May 2026 09:27:19 +0200 Subject: [PATCH 1/2] correct branch name --- process/process_areas/release_management/release_concept.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/process/process_areas/release_management/release_concept.rst b/process/process_areas/release_management/release_concept.rst index 2ec76b8688..7f395edcb8 100644 --- a/process/process_areas/release_management/release_concept.rst +++ b/process/process_areas/release_management/release_concept.rst @@ -112,10 +112,9 @@ Branching Strategy Branches: -* master: for implementation and documentation in development phase. +* main: for implementation and documentation in development phase. * release/\*: Branches for distinct releases, named release/, no functional changes, only bugfixes, quality and documentation improvements. - Workflow: #. When ready for a new release, create a branch release/ from master (if needed). From 2a6188920ebe8e92f3e19195a6eb0a88d1790c7e Mon Sep 17 00:00:00 2001 From: "jhr2hi@bosch.com" Date: Mon, 11 May 2026 09:27:34 +0200 Subject: [PATCH 2/2] correct branch name --- process/process_areas/release_management/release_concept.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/process_areas/release_management/release_concept.rst b/process/process_areas/release_management/release_concept.rst index 7f395edcb8..86fa937239 100644 --- a/process/process_areas/release_management/release_concept.rst +++ b/process/process_areas/release_management/release_concept.rst @@ -117,6 +117,6 @@ Branches: Workflow: -#. When ready for a new release, create a branch release/ from master (if needed). +#. When ready for a new release, create a branch release/ from main (if needed). #. Perform final testing and adjustments on the release branch (test results should be available continuously, but maybe not all). #. Tag the release in the release branch.