summaryrefslogtreecommitdiffstats
path: root/.github/workflows/develop_update.yml
Commit message (Collapse)AuthorAgeFilesLines
* identify the qmk-botZach White2020-11-221-0/+2
|
* Fix failed develop updates within CI (#11001)Joel Challis2020-11-221-2/+5
| | | | | * Fix inverted logic * skip locked instead of fail
* Rebase develop after a master push (#10812)Zach White2020-11-211-0/+32
* 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