miryoku_qmk: Rebase onto qmk fails

[hmaerki]

Error

Rebase this repo onto qmk/qmk_firmware/master fails to to some conflicts.

How to reproduce

Run https://github.com/hmaerki/fork_miryoku_qmk/blob/miryoku/.github/workflows/test-merge.yml.

The github action will fail on:

revert=`git log --grep='^\[miryoku-github\]' --pretty='format:%H' | tr '\n' ' '`
git revert $revert
CONFLICT (modify/delete): .github/workflows/test-merge.yml deleted in parent of e1307cc3a7 ([miryoku-github] Squashed local commits from previous miryoku branch) and modified in HEAD. Version HEAD of .github/workflows/test-merge.yml left in tree.
CONFLICT (modify/delete): .github/workflows/main.yml deleted in parent of e1307cc3a7 ([miryoku-github] Squashed local commits from previous miryoku branch) and modified in HEAD. Version HEAD of .github/workflows/main.yml left in tree.

The same error occurs when calling the github action Build Inputs with Keyboard=crkbd and Merge QMK Branches=qmk/qmk_firmware/master.

Background

Run miyoku_qmk was rebased last onto qmk on miryoku-20230407. This is two years ago!

It would be very helpful to rebase again!

I have a Corne v4.1 (crkbd/rev4_1/standard) which would be supported after the rebase. The Corne v4.0 and v4.1 are in wide use now therefore many people would benefit from this rebase.

[manna-harbour]

Please use Discussions for support. See.https://github.com/manna-harbour/miryoku#discussions-and-support.

[manna-harbour]

See #287.