You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
|`develop`| Working branch for next release, e.g. `3.7.x`| ✅ |
13
-
|`fix/*`| Temporary branches for single patch | - |
14
-
|`feature/*`| Temporary branches for single feature | - |
15
-
|`release/*`| Pre-releases in testing before they are merged into `main` when released | only during release testing |
16
-
17
-
We will review all pull requests (PRs) to `develop` and merge them if accepted, once an appropriate version is upcoming. Please understand that this might not be the immediate next release and might take some time.
|`develop-patch`| Working branch for next patch release, e.g. `4.0.x`| ✅ |
13
+
|`develop-minor`| Working branch for next minor release, e.g. `4.x.0`| ✅ |
14
+
|`v5/develop`| Working branch for next major release, e.g. `5.0.0`| ✅ |
15
+
|`fix/*`| Temporary branches for single bugfix | - |
16
+
|`feature/*`| Temporary branches for single feature | - |
17
+
|`release/*`| Pre-releases in testing before they are merged into `main` when released | only during release testing |
18
+
19
+
We will review all pull requests (PRs) to `develop-patch`, `develop-minor` and `v5/develop` and merge them if accepted, once an appropriate version is upcoming. Please understand that this might not be the immediate next release and might take some time.
18
20
19
21
## How you can contribute
20
22
@@ -26,25 +28,25 @@ When you find a bug, the first step to fixing it is to help us understand and re
26
28
27
29
For bug fixes, please create a new branch following the name scheme: `fix/issue_number-bug-x`, e.g. `fix/234-this-nasty-bug`. Limit bug fix PRs to a single bug. **Do not mix multiple bug fixes in a single PR.** This will make it easier for us to review the fix and merge it.
28
30
29
-
- Always send bug fix PRs against the `develop` branch––not `main`.
31
+
- Always send bug fix PRs against the `develop-patch` branch––not `main`.
30
32
- Add a helpful description of what the PR does if it is not 100% self-explanatory.
31
33
- Every bug fix should include a [unit test](#tests) to avoid future regressions. Let us know if you need help with that.
32
34
- Make sure your code [style](#style) matches ours and includes [comments/in-code documentation](#documentation).
33
-
- Make sure your branch is up to date with the latest state on the `develop` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
35
+
- Make sure your branch is up to date with the latest state on the `develop-patch` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
34
36
- Please *don't* commit updated dist files in the `panel/dist` folder to avoid merge conflicts. We only build the dist files on release. Your branch should only contain changes to the source files.
35
37
36
38
### Features
37
39
38
40
For features create a new branch following the name scheme: `feature/issue_number-feature-x`, e.g. `feature/123-awesome-function`. Our [feedback platform](https://feedback.getkirby.com) can be a good source of highly requested features. Maybe your feature idea already exists and you can get valuable feedback from other Kirby users. Focus on a single feature per PR. Don't mix features!
39
41
40
-
- Always send feature PRs against the `develop` branch––not `main`.
42
+
- Always send feature PRs against the `develop-minor` branch––not `main`.
41
43
- Add a helpful description of what the PR does.
42
44
- New features should include [unit tests](#tests). Let us know if you need help with that.
43
45
- Make your code [style](#style) matches ours and includes [comments/in-code documentation](#documentation).
44
-
- Make sure your branch is up to date with the latest state on the `develop` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
46
+
- Make sure your branch is up to date with the latest state on the `develop-minor` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
45
47
- Please *don't* commit updated dist files in the `panel/dist` folder to avoid merge conflicts. We only build the dist files on release. Your branch should only contain changes to the source files.
46
48
47
-
We try to bundle features in our major releases, e.g. `3.x`. That is why we might only review and, if accepted, merge your PR once an appropriate release is upcoming. Please understand that we cannot merge all feature ideas or that it might take a while. Check out the [roadmap](https://roadmap.getkirby.com) to see upcoming releases.
49
+
We try to bundle features in our major releases, e.g. `5.0`. That is why we might only review and, if accepted, merge your PR once an appropriate release is upcoming. Please understand that we cannot merge all feature ideas or that it might take a while. Check out the [roadmap](https://roadmap.getkirby.com) to see upcoming releases.
0 commit comments