diff options
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index abace8164..3ee14f2bf 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 | * [2020 Nov 28](ChangeLog/20201128.md) | ||
| 9 | * [2020 Aug 29](ChangeLog/20200829.md) | 10 | * [2020 Aug 29](ChangeLog/20200829.md) |
| 10 | * [2020 May 30](ChangeLog/20200530.md) | 11 | * [2020 May 30](ChangeLog/20200530.md) |
| 11 | * [2020 Feb 29](ChangeLog/20200229.md) | 12 | * [2020 Feb 29](ChangeLog/20200229.md) |
| @@ -13,16 +14,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero | |||
| 13 | 14 | ||
| 14 | ## When is the next Breaking Change? | 15 | ## When is the next Breaking Change? |
| 15 | 16 | ||
| 16 | The next Breaking Change is scheduled for November 28, 2020. | 17 | The next Breaking Change is scheduled for February 27, 2021. |
| 17 | 18 | ||
| 18 | ### Important Dates | 19 | ### Important Dates |
| 19 | 20 | ||
| 20 | * [x] 2020 Aug 29 - `develop` is created. It will be rebased weekly. | 21 | * [x] 2020 Nov 28 - `develop` is created. Each push to `master` is subsequently merged to `develop` |
| 21 | * [ ] 2020 Oct 31 - `develop` closed to new PR's. | 22 | * [ ] 2021 Jan 30 - `develop` closed to new PR's. |
| 22 | * [ ] 2020 Oct 31 - Call for testers. | 23 | * [ ] 2021 Jan 30 - Call for testers. |
| 23 | * [ ] 2020 Nov 26 - `master` is locked, no PR's merged. | 24 | * [ ] 2021 Feb 25 - `master` is locked, no PR's merged. |
| 24 | * [ ] 2020 Nov 28 - Merge `develop` to `master`. | 25 | * [ ] 2021 Feb 27 - Merge `develop` to `master`. |
| 25 | * [ ] 2020 Nov 28 - `master` is unlocked. PR's can be merged again. | 26 | * [ ] 2021 Feb 27 - `master` is unlocked. PR's can be merged again. |
| 26 | 27 | ||
| 27 | ## What changes will be included? | 28 | ## What changes will be included? |
| 28 | 29 | ||
| @@ -39,21 +40,6 @@ Criteria for acceptance: | |||
| 39 | 40 | ||
| 40 | This section documents various processes we use when running the Breaking Changes process. | 41 | This section documents various processes we use when running the Breaking Changes process. |
| 41 | 42 | ||
| 42 | ## Rebase `develop` from `master` | ||
| 43 | |||
| 44 | This is run every Friday while `develop` is open. | ||
| 45 | |||
| 46 | Process: | ||
| 47 | |||
| 48 | ``` | ||
| 49 | cd qmk_firmware | ||
| 50 | git checkout master | ||
| 51 | git pull --ff-only | ||
| 52 | git checkout develop | ||
| 53 | git rebase master | ||
| 54 | git push --force | ||
| 55 | ``` | ||
| 56 | |||
| 57 | ## Creating the `develop` branch | 43 | ## Creating the `develop` branch |
| 58 | 44 | ||
| 59 | This happens immediately after the previous `develop` branch is merged. | 45 | This happens immediately after the previous `develop` branch is merged. |
