diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-06-20 12:10:59 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-06-20 12:10:59 +1000 |
| commit | e3030bff5e6b241ef8934ddaf84e524d0fd32bce (patch) | |
| tree | 976aa1cc9d25c884ecedc548ce507404904414a3 /docs/breaking_changes.md | |
| parent | 5b7cf9fdc86bf92b465565b2be5d501ea9529f37 (diff) | |
| parent | 4dddcb4f0300f79d8fbfc462ff8d6b360e99989e (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 2ad8b5a14d..a1a56bd457 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -56,7 +56,7 @@ This happens immediately after the previous `develop` branch is merged. * [ ] `git commit -m 'Branch point for <DATE> Breaking Change'` * [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>` * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing - * [ ] `git push origin develop` + * [ ] `git push upstream develop` * [ ] `git push --tags` ## 4 Weeks Before Merge @@ -86,17 +86,21 @@ This happens immediately after the previous `develop` branch is merged. * `qmk_firmware` git commands * [ ] `git checkout develop` * [ ] `git pull --ff-only` - * [ ] `git rebase origin/master` * [ ] Edit `readme.md` * [ ] Remove the notes about `develop` * [ ] Roll up the ChangeLog into one file. * [ ] `git commit -m 'Merge point for <DATE> Breaking Change'` - * [ ] `git push origin develop` + * [ ] `git push upstream develop` * GitHub Actions * [ ] Create a PR for `develop` * [ ] Make sure travis comes back clean - * [ ] Merge `develop` PR + * [ ] **Turn off 'Automatically delete head branches' for the repository** -- confirm with @qmk/directors that it is done before continuing +* `qmk_firmware` git commands + * [ ] `git checkout master` + * [ ] `git pull --ff-only` + * [ ] `git merge --no-ff develop` + * [ ] `git push upstream master` ## Post-merge operations -* (Optional) [update ChibiOS + ChibiOS-Contrib on `develop`](chibios_upgrade_instructions.md) \ No newline at end of file +* (Optional) [update ChibiOS + ChibiOS-Contrib on `develop`](chibios_upgrade_instructions.md) |