tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update merge sequence to reflect no-ff, no-squash. (#13038)

master
Nick Brassel 2021-06-18 09:05:27 +10:00 committed by GitHub
parent 89c01970e3
commit e7ddbc394b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/breaking_changes.md
View File

@ -56,7 +56,7 @@ This happens immediately after the previous `develop` branch is merged.
* [ ] `git commit -m 'Branch point for <DATE> Breaking Change'` * [ ] `git commit -m 'Branch point for <DATE> Breaking Change'`
* [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>` * [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>`
* [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
* [ ] `git push origin develop` * [ ] `git push upstream develop`
* [ ] `git push --tags` * [ ] `git push --tags`
## 4 Weeks Before Merge ## 4 Weeks Before Merge
@ -86,13 +86,17 @@ This happens immediately after the previous `develop` branch is merged.
* `qmk_firmware` git commands * `qmk_firmware` git commands
* [ ] `git checkout develop` * [ ] `git checkout develop`
* [ ] `git pull --ff-only` * [ ] `git pull --ff-only`
* [ ] `git rebase origin/master`
* [ ] Edit `readme.md` * [ ] Edit `readme.md`
* [ ] Remove the notes about `develop` * [ ] Remove the notes about `develop`
* [ ] Roll up the ChangeLog into one file. * [ ] Roll up the ChangeLog into one file.
* [ ] `git commit -m 'Merge point for <DATE> Breaking Change'` * [ ] `git commit -m 'Merge point for <DATE> Breaking Change'`
* [ ] `git push origin develop` * [ ] `git push upstream develop`
* GitHub Actions * GitHub Actions
* [ ] Create a PR for `develop` * [ ] Create a PR for `develop`
* [ ] Make sure travis comes back clean * [ ] 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`