Cutieguwu/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-07-10 19:04:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,214 Commits 57 Branches 1,710 Tags
46e85ded4747fb3d89f107cb098d9054ea5e632c
Commit Graph

4 Commits

Author SHA1 Message Date
Joel Challis 46e85ded47 Add merge workflow for XAP branch (#16652) 
* Add merge workflow for XAP branch

* uncomment
 2022-03-15 12:49:23 +00:00
Zach White c731628946 identify the qmk-bot 2020-11-22 08:07:45 -08:00
Joel Challis ca9edc5fe3 Fix failed develop updates within CI (#11001) 
* Fix inverted logic

* skip locked instead of fail
 2020-11-22 07:50:14 -08:00
Zach White 8ddbb19df1 Rebase develop after a master push (#10812) 
* rebase develop after a master push

* limit this to qmk/qmk_firmware

* change to a merge strategy

* GITHUB_TOKEN isn't needed

* check for .locked in develop

* break up into more steps
 2020-11-21 11:48:13 -08:00