diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-06-18 09:05:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 00:05:27 +0100 |
| commit | e7ddbc394b7fa88b390435523f70cf30d6b9cea3 (patch) | |
| tree | 8ea87bd35ae9bdb07f2c85db1c257ed94d3a33e5 | |
| parent | 89c01970e333e346c25202e9c568b75cad4c7be5 (diff) | |
Update merge sequence to reflect no-ff, no-squash. (#13038)
| -rw-r--r-- | docs/breaking_changes.md | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 3e85a70761..b0d56a81bd 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,13 +86,17 @@ 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` |