Cian-H/qmk_firmware
1
0
Fork 0
mirror of https://github.com/Cian-H/qmk_firmware.git synced 2025-12-25 23:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,804 Commits 1 Branch 0 Tags
ca9edc5fe392d0349e77c26b745cbef2f85b160e
Commit Graph

2 Commits

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