From 73dbb042bfa76451a95d43877ff883270c37009c Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 29 May 2022 08:15:16 +1000 Subject: [PATCH] Branch point after 2022-05-28 Breaking Change. --- docs/breaking_changes.md | 4 +++- readme.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 981512cd4c8..f25529009c8 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -58,7 +58,9 @@ This happens immediately after the previous `develop` branch is merged. * `qmk_firmware` git commands * [ ] `git checkout master` * [ ] `git pull --ff-only` - * [ ] `git checkout -b develop` + * [ ] `git checkout develop` + * [ ] `git pull --ff-only` + * [ ] `git merge -no-ff master` * [ ] Edit `readme.md` * [ ] Add a big notice at the top that this is a testing branch. * [ ] Include a link to this document diff --git a/readme.md b/readme.md index 5649ddfa097..63b483c7447 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,7 @@ +# This is the `develop` branch! + +See the [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) document for more information. + # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)