diff options
| author | James Young <xxiinophobia@yahoo.com> | 2020-01-04 12:24:51 -0800 |
|---|---|---|
| committer | James Young <xxiinophobia@yahoo.com> | 2020-01-04 12:24:51 -0800 |
| commit | c1feeaa57f28c781e39996e5d4eea3a31f083439 (patch) | |
| tree | ca9fc68643659661d5f82dd0325c0067090c4fd5 | |
| parent | 6e520a721dc093244473bb786a1058d655f75406 (diff) | |
| download | qmk_firmware-c1feeaa57f28c781e39996e5d4eea3a31f083439.tar.gz qmk_firmware-c1feeaa57f28c781e39996e5d4eea3a31f083439.zip | |
Update Breaking Changes doc for 2020-02-29 merge
| -rw-r--r-- | docs/breaking_changes.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index b5bcb7a1c..fc71cf5ab 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md | |||
| @@ -10,16 +10,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero | |||
| 10 | 10 | ||
| 11 | ## When is the next Breaking Change? | 11 | ## When is the next Breaking Change? |
| 12 | 12 | ||
| 13 | The next Breaking Change is scheduled for Nov 29. | 13 | The next Breaking Change is scheduled for February 29, 2020. |
| 14 | 14 | ||
| 15 | ### Important Dates | 15 | ### Important Dates |
| 16 | 16 | ||
| 17 | * [x] 2019 Sep 21 - `future` is created. It will be rebased weekly. | 17 | * [x] 2019 Sep 21 - `future` is created. It will be rebased weekly. |
| 18 | * [ ] 2019 Nov 01 - `future` closed to new PR's. | 18 | * [ ] 2020 Jan 11 - `future` closed to new PR's. |
| 19 | * [ ] 2019 Nov 01 - Call for testers. | 19 | * [ ] 2020 Jan 11 - Call for testers. |
| 20 | * [ ] 2019 Nov 27 - `master` is locked, no PR's merged. | 20 | * [ ] 2020 Feb 26 - `master` is locked, no PR's merged. |
| 21 | * [ ] 2019 Nov 29 - Merge `future` to `master`. | 21 | * [ ] 2020 Feb 28 - Merge `future` to `master`. |
| 22 | * [ ] 2019 Nov 30 - `master` is unlocked. PR's can be merged again. | 22 | * [ ] 2020 Feb 29 - `master` is unlocked. PR's can be merged again. |
| 23 | 23 | ||
| 24 | ## What changes will be included? | 24 | ## What changes will be included? |
| 25 | 25 | ||
| @@ -68,7 +68,7 @@ This happens immediately after the previous `future` branch is merged. | |||
| 68 | * [ ] `git push origin future` | 68 | * [ ] `git push origin future` |
| 69 | * [ ] `git push --tags` | 69 | * [ ] `git push --tags` |
| 70 | 70 | ||
| 71 | ## 4 Weeks Before Merge | 71 | ## 4+ Weeks Before Merge |
| 72 | 72 | ||
| 73 | * `future` is now closed to new PR's, only fixes for current PR's may be merged | 73 | * `future` is now closed to new PR's, only fixes for current PR's may be merged |
| 74 | * Post call for testers | 74 | * Post call for testers |