aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/breaking_changes.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index b193b12da..b5bcb7a1c 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -14,7 +14,7 @@ The next Breaking Change is scheduled for Nov 29.
14 14
15### Important Dates 15### Important Dates
16 16
17* [ ] 2019 Oct 04 - `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* [ ] 2019 Nov 01 - `future` closed to new PR's.
19* [ ] 2019 Nov 01 - Call for testers. 19* [ ] 2019 Nov 01 - Call for testers.
20* [ ] 2019 Nov 27 - `master` is locked, no PR's merged. 20* [ ] 2019 Nov 27 - `master` is locked, no PR's merged.
@@ -51,7 +51,9 @@ git rebase master
51git push --force 51git push --force
52``` 52```
53 53
54## 8 Weeks Before Merge 54## Creating the `future` branch
55
56This happens immediately after the previous `future` branch is merged.
55 57
56* `qmk_firmware` git commands 58* `qmk_firmware` git commands
57 * [ ] `git checkout master` 59 * [ ] `git checkout master`
@@ -65,9 +67,6 @@ git push --force
65 * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing 67 * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
66 * [ ] `git push origin future` 68 * [ ] `git push origin future`
67 * [ ] `git push --tags` 69 * [ ] `git push --tags`
68* GitHub Actions
69 * [ ] Switch all [breaking_change PR's](https://github.com/qmk/qmk_firmware/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Abreaking_change) to `future`
70 * [ ] Any that have a ChangeLog entry may be merged immediately.
71 70
72## 4 Weeks Before Merge 71## 4 Weeks Before Merge
73 72