From bb91b83db1666dadb6e221e4eae56006dd45faa2 Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 14:58:45 +0100 Subject: [PATCH 1/6] [5.4] docs: Add guidelines for Pull Request target branches --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 1fa2cde855995..1de1673732c2c 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,17 @@ Do you want to improve Joomla? * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers). * Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms) +Which branch should my Pull Request target? +-------------------- +Using a simple classification keeps the project **stable**, **transparent**, and **easy** for everyone to contribute. + +| Type of change | What it means | Target branch | +|---|---|---| +| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **5.4-dev** (6.0-dev) | +| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **6.1-dev** | + +The maintainer team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch – no need for a discussion. + Copyright --------------------- * (C) 2005 Open Source Matters, Inc. From 63ffa374f2d7dcafd5c2c51925a8ae4535370127 Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 15:10:02 +0100 Subject: [PATCH 2/6] [5.4] docs: Add guidelines for Pull Request target branches --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1de1673732c2c..60835c66836d6 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Using a simple classification keeps the project **stable**, **transparent**, and | **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **5.4-dev** (6.0-dev) | | **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **6.1-dev** | -The maintainer team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch – no need for a discussion. +A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch. Copyright --------------------- From c6c8798d11e4c2e54e5a7e377c2c797f3a2e59ff Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 16:30:05 +0100 Subject: [PATCH 3/6] docs:Clarify bug classification and target branches footnote --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 60835c66836d6..238ee967ec880 100644 --- a/README.md +++ b/README.md @@ -80,11 +80,13 @@ Using a simple classification keeps the project **stable**, **transparent**, and | Type of change | What it means | Target branch | |---|---|---| -| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **5.4-dev** (6.0-dev) | +| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **5.4-dev** (6.0-dev)[^1] | | **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **6.1-dev** | A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch. +[^1]: All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the `6.0-dev` branch. + Copyright --------------------- * (C) 2005 Open Source Matters, Inc. From cb8656c203287eeec535994f17a2c5fffcd36461 Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 16:32:48 +0100 Subject: [PATCH 4/6] docs: Add target branch links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 238ee967ec880..bdbc0fadc2d4b 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,8 @@ Using a simple classification keeps the project **stable**, **transparent**, and | Type of change | What it means | Target branch | |---|---|---| -| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **5.4-dev** (6.0-dev)[^1] | -| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **6.1-dev** | +| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** ([6.0-dev](https://github.com/joomla/joomla-cms/tree/6.0-dev))[^1] | +| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.1-dev](https://github.com/joomla/joomla-cms/tree/6.1-dev)** | A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch. From 90f49a3b190404ce4d3da86aa73f25789103400d Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 16:37:38 +0100 Subject: [PATCH 5/6] docs: Clarify bug target branches --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bdbc0fadc2d4b..7e511b4171333 100644 --- a/README.md +++ b/README.md @@ -80,12 +80,14 @@ Using a simple classification keeps the project **stable**, **transparent**, and | Type of change | What it means | Target branch | |---|---|---| -| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** ([6.0-dev](https://github.com/joomla/joomla-cms/tree/6.0-dev))[^1] | +| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** ([6.0-dev](https://github.com/joomla/joomla-cms/tree/6.0-dev)) **\*** | | **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.1-dev](https://github.com/joomla/joomla-cms/tree/6.1-dev)** | +**\*** All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the `6.0-dev` branch. + A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch. -[^1]: All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the `6.0-dev` branch. + Copyright --------------------- From 863fcda0a9a5eee4c472626e414d5d472ee1f32a Mon Sep 17 00:00:00 2001 From: Martina Scholz Date: Wed, 19 Nov 2025 16:40:23 +0100 Subject: [PATCH 6/6] docs: Update target branch links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e511b4171333..f81129bd1f852 100644 --- a/README.md +++ b/README.md @@ -80,10 +80,10 @@ Using a simple classification keeps the project **stable**, **transparent**, and | Type of change | What it means | Target branch | |---|---|---| -| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** ([6.0-dev](https://github.com/joomla/joomla-cms/tree/6.0-dev)) **\*** | +| **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** (6.0-dev) **\*** | | **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.1-dev](https://github.com/joomla/joomla-cms/tree/6.1-dev)** | -**\*** All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the `6.0-dev` branch. +**\*** All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.0.x should target the [`6.0-dev`](https://github.com/joomla/joomla-cms/tree/6.0-dev) branch. A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch.