melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-02-01 02:00:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,998 Commits 21 Branches 1,495 Tags
2b097d670a9fa458b8d059f824a0cbbd5b6c6659
Commit Graph

3 Commits

Author SHA1 Message Date
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