diff options
author | fauxpark <[email protected]> | 2023-04-03 20:59:24 +1000 |
---|---|---|
committer | fauxpark <[email protected]> | 2023-04-03 20:59:24 +1000 |
commit | bd4899f0ca1f687ac2ede437ffb5ad1af04f1abe (patch) | |
tree | 01d9f6709af24f5833dcdc3f3de5671d0766ccd8 /docs/pr_checklist.md | |
parent | fcf8b804ed95a98561bd4c1d6c85604be0f7cc7b (diff) | |
parent | d06ce0153bd4b608a20698c4a9e1d559b4c05683 (diff) | |
download | qmk_firmware-bd4899f0ca1f687ac2ede437ffb5ad1af04f1abe.tar.gz qmk_firmware-bd4899f0ca1f687ac2ede437ffb5ad1af04f1abe.zip |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'docs/pr_checklist.md')
-rw-r--r-- | docs/pr_checklist.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md index bacb9480da..6dc6c0000d 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -53,6 +53,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard - keyboard moves within the repository *must* go through the `develop` branch instead of `master`, so as to ensure compatibility for users - `data/mappings/keyboard_aliases.hjson` must be updated to reflect the move, so users with pre-created configurator keymap.json files continue to detect the correct keyboard +- keyboard updates and refactors (eg. to data driven) *must* go through `develop` to reduce `master` -> `develop` merge conflicts - PR submissions from a `kbfirmware` export (or equivalent) will not be accepted unless converted to new QMK standards -- try `qmk import-kbfirmware` first - `info.json` - With the move to [data driven](https://docs.qmk.fm/#/data_driven_config) keyboard configuration, we encourage contributors to utilise as many features as possible of the info.json [schema](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema). |