diff options
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 754e6ec97..c5f4eec04 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md | |||
| @@ -6,6 +6,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero | |||
| 6 | 6 | ||
| 7 | ## What has been included in past Breaking Changes? | 7 | ## What has been included in past Breaking Changes? |
| 8 | 8 | ||
| 9 | * [2021 Aug 28](ChangeLog/20210828.md) | ||
| 9 | * [2021 May 29](ChangeLog/20210529.md) | 10 | * [2021 May 29](ChangeLog/20210529.md) |
| 10 | * [2021 Feb 27](ChangeLog/20210227.md) | 11 | * [2021 Feb 27](ChangeLog/20210227.md) |
| 11 | * [2020 Nov 28](ChangeLog/20201128.md) | 12 | * [2020 Nov 28](ChangeLog/20201128.md) |
| @@ -20,12 +21,12 @@ The next Breaking Change is scheduled for August 28, 2021. | |||
| 20 | 21 | ||
| 21 | ### Important Dates | 22 | ### Important Dates |
| 22 | 23 | ||
| 23 | * [x] 2021 May 29 - `develop` is created. Each push to `master` is subsequently merged to `develop` | 24 | * [x] 2021 Aug 29 - `develop` is created. Each push to `master` is subsequently merged to `develop` |
| 24 | * [ ] 2021 Jul 31 - `develop` closed to new PR's. | 25 | * [ ] 2021 Oct 31 - `develop` closed to new PR's. |
| 25 | * [ ] 2021 Jul 31 - Call for testers. | 26 | * [ ] 2021 Oct 31 - Call for testers. |
| 26 | * [ ] 2021 Aug 26 - `master` is locked, no PR's merged. | 27 | * [ ] 2021 Nov 26 - `master` is locked, no PR's merged. |
| 27 | * [ ] 2021 Aug 28 - Merge `develop` to `master`. | 28 | * [ ] 2021 Nov 28 - Merge `develop` to `master`. |
| 28 | * [ ] 2021 Aug 28 - `master` is unlocked. PR's can be merged again. | 29 | * [ ] 2021 Nov 28 - `master` is unlocked. PR's can be merged again. |
| 29 | 30 | ||
| 30 | ## What changes will be included? | 31 | ## What changes will be included? |
| 31 | 32 | ||
| @@ -99,3 +100,7 @@ This happens immediately after the previous `develop` branch is merged. | |||
| 99 | * [ ] `git pull --ff-only` | 100 | * [ ] `git pull --ff-only` |
| 100 | * [ ] `git merge --no-ff develop` | 101 | * [ ] `git merge --no-ff develop` |
| 101 | * [ ] `git push upstream master` | 102 | * [ ] `git push upstream master` |
| 103 | |||
| 104 | ## Post-merge operations | ||
| 105 | |||
| 106 | * (Optional) [update ChibiOS + ChibiOS-Contrib on `develop`](chibios_upgrade_instructions.md) | ||
