1
0
Эх сурвалжийг харах

Branch point after 2022-05-28 Breaking Change.

Nick Brassel 4 жил өмнө
parent
commit
73dbb042bf

+ 3 - 1
docs/breaking_changes.md

@@ -58,7 +58,9 @@ This happens immediately after the previous `develop` branch is merged.
 * `qmk_firmware` git commands
 * `qmk_firmware` git commands
     * [ ] `git checkout master`
     * [ ] `git checkout master`
     * [ ] `git pull --ff-only`
     * [ ] `git pull --ff-only`
-    * [ ] `git checkout -b develop`
+    * [ ] `git checkout develop`
+    * [ ] `git pull --ff-only`
+    * [ ] `git merge -no-ff master`
     * [ ] Edit `readme.md`
     * [ ] Edit `readme.md`
         * [ ] Add a big notice at the top that this is a testing branch.
         * [ ] Add a big notice at the top that this is a testing branch.
         * [ ] Include a link to this document
         * [ ] Include a link to this document

+ 4 - 0
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
 # Quantum Mechanical Keyboard Firmware
 
 
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
 [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)