diff options
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r-- | docs/breaking_changes.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index d72a8d4761..7f87283e85 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -10,9 +10,9 @@ Practically, this means QMK merges the `develop` branch into the `master` branch ## What has been included in past Breaking Changes? +* [2024 Aug 25](ChangeLog/20240825) * [2024 May 26](ChangeLog/20240526) * [2024 Feb 25](ChangeLog/20240225) -* [2023 Nov 26](ChangeLog/20231126) * [Older Breaking Changes](breaking_changes_history) ## When is the next Breaking Change? @@ -21,14 +21,14 @@ The next Breaking Change is scheduled for August 25, 2024. ### Important Dates -* 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. -* 2024 Jul 28 - `develop` closed to new PRs. -* 2024 Jul 28 - Call for testers. -* 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes -* 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged. -* 2024 Aug 22 - `master` is locked, no PRs merged. -* 2024 Aug 25 - Merge `develop` to `master`. -* 2024 Aug 25 - `master` is unlocked. PRs can be merged again. +* 2024 Aug 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. +* 2024 Oct 27 - `develop` closed to new PRs. +* 2024 Oct 27 - Call for testers. +* 2024 Nov 10 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes +* 2024 Nov 17 - `develop` is locked, only critical bugfix PRs merged. +* 2024 Nov 22 - `master` is locked, no PRs merged. +* 2024 Nov 24 - Merge `develop` to `master`. +* 2024 Nov 24 - `master` is unlocked. PRs can be merged again. ## What changes will be included? @@ -48,7 +48,7 @@ Criteria for acceptance: Strongly suggested: -* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20240526`. +* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20241124`. * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID. * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. |