Merge conflict when merging with QMK :(

Question

Merge conflict when merging with QMK :(

stratosgear opened this issue a year ago · comments

Hi,

I am new to miryoku and I am trying to do a very basic vanilla build for mty new Kyria keyboard.

If I read the instructions correctly I would have to merge QMK and miryoku_qmk branches together with:

git clone git@github.com:qmk/qmk_firmware.git
cd qmk_firmware
git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git
git fetch miryoku_qmk
git checkout --track miryoku_qmk/miryoku
make git-submodule
git checkout -b miryoku-merge-master
git revert --no-edit `git log --grep='^\[miryoku-github\]' --pretty='format:%H' | tr '\n' ' '`
git fetch origin  # Maybe not even needed, as I just did a checkout 
git merge origin/master

But when I try it on a brand new directory, I get the following error after the last command:

Auto-merging users/manna-harbour_miryoku/manna-harbour_miryoku.c
CONFLICT (content): Merge conflict in users/manna-harbour_miryoku/manna-harbour_miryoku.c
Automatic merge failed; fix conflicts and then commit the result.

Checking the differences I see:

diff --cc users/manna-harbour_miryoku/manna-harbour_miryoku.c
index 5de5d9b129,389580759b..0000000000
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@@ -17,14 -17,14 +17,22 @@@ MIRYOKU_LAYER_LIS
  #undef MIRYOKU_X
  };
  
++<<<<<<< HEAD
 +void u_td_fn_boot(qk_tap_dance_state_t *state, void *user_data) { \
++=======
+ void u_td_fn_boot(tap_dance_state_t *state, void *user_data) {
++>>>>>>> origin/master
    if (state->count == 2) {
      reset_keyboard();
    }
  }
  
  #define MIRYOKU_X(LAYER, STRING) \
++<<<<<<< HEAD
 +void u_td_fn_U_##LAYER(qk_tap_dance_state_t *state, void *user_data) { \
++=======
+ void u_td_fn_U_##LAYER(tap_dance_state_t *state, void *user_data) { \
++>>>>>>> origin/master
    if (state->count == 2) { \
      default_layer_set((layer_state_t)1 << U_##LAYER); \
    } \
@@@ -32,7 -32,7 +40,11 @@@
  MIRYOKU_LAYER_LIST
  #undef MIRYOKU_X
  
++<<<<<<< HEAD
 +qk_tap_dance_action_t tap_dance_actions[] = {
++=======
+ tap_dance_action_t tap_dance_actions[] = {
++>>>>>>> origin/master
      [U_TD_BOOT] = ACTION_TAP_DANCE_FN(u_td_fn_boot),
  #define MIRYOKU_X(LAYER, STRING) [U_TD_U_##LAYER] = ACTION_TAP_DANCE_FN(u_td_fn_U_##LAYER),
  MIRYOKU_LAYER_LIST
(END)

Am I doing something wrong? Is something broken?

Full list of the commands executed from above:

stratos@iocaine 
/mnt/projects/sources 
❯ git clone git@github.com:qmk/qmk_firmware.git
Cloning into 'qmk_firmware'...
remote: Enumerating objects: 512800, done.
remote: Counting objects: 100% (24/24), done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 512800 (delta 10), reused 14 (delta 5), pack-reused 512776
Receiving objects: 100% (512800/512800), 258.03 MiB | 13.04 MiB/s, done.
Resolving deltas: 100% (287377/287377), done.
Updating files: 100% (39069/39069), done.

stratos@iocaine 
/mnt/projects/sources 
➜  cd qmk_firmware

stratos@iocaine 
…/qmk_firmware [ master] [🐍 v3.10.10] [⍱ v2.3.4] 
✦ ➜  git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git

stratos@iocaine 
…/qmk_firmware [ master] [🐍 v3.10.10] [⍱ v2.3.4] 
➜  git fetch miryoku_qmk
remote: Enumerating objects: 1583, done.
remote: Counting objects: 100% (630/630), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 1583 (delta 625), reused 625 (delta 625), pack-reused 953
Receiving objects: 100% (1583/1583), 371.29 KiB | 1.23 MiB/s, done.
Resolving deltas: 100% (1100/1100), completed with 153 local objects.
From github.com:manna-harbour/miryoku_qmk
 * [new branch]            fingerpunch-test                -> miryoku_qmk/fingerpunch-test
 * [new branch]            keyboardio-model01-no-leds-test -> miryoku_qmk/keyboardio-model01-no-leds-test
 * [new branch]            klor-keyboard-test              -> miryoku_qmk/klor-keyboard-test
 * [new branch]            klor-test                       -> miryoku_qmk/klor-test
 * [new branch]            miryoku                         -> miryoku_qmk/miryoku
 * [new branch]            miryoku-20200608                -> miryoku_qmk/miryoku-20200608
 * [new branch]            miryoku-20210703                -> miryoku_qmk/miryoku-20210703
 * [new branch]            miryoku-20211015                -> miryoku_qmk/miryoku-20211015
 * [new branch]            miryoku-20220227                -> miryoku_qmk/miryoku-20220227
 * [new branch]            miryoku-20220706                -> miryoku_qmk/miryoku-20220706
 * [new branch]            miryoku-20220926                -> miryoku_qmk/miryoku-20220926
 * [new branch]            miryoku-20221121                -> miryoku_qmk/miryoku-20221121
 * [new branch]            miryoku-mousebuttons-tmp        -> miryoku_qmk/miryoku-mousebuttons-tmp
 * [new branch]            rollow-test                     -> miryoku_qmk/rollow-test
 * [new branch]            split_3x5_2-test                -> miryoku_qmk/split_3x5_2-test
 * [new branch]            yunomi-test                     -> miryoku_qmk/yunomi-test

stratos@iocaine 
…/qmk_firmware [ master] [🐍 v3.10.10] [⍱ v2.3.4] [⏱ 3s ] 
➜  git checkout --track miryoku_qmk/miryoku
branch 'miryoku' set up to track 'miryoku_qmk/miryoku'.
Switched to a new branch 'miryoku'

stratos@iocaine 
…/qmk_firmware [ miryoku] [🐍 v3.10.10] [⍱ v2.3.4] 
➜  make git-submodule
QMK Firmware 0.19.0
Submodule 'lib/chibios' (https://github.com/qmk/ChibiOS) registered for path 'lib/chibios'
Submodule 'lib/chibios-contrib' (https://github.com/qmk/ChibiOS-Contrib) registered for path 'lib/chibios-contrib'
Submodule 'lib/googletest' (https://github.com/qmk/googletest) registered for path 'lib/googletest'
Submodule 'lib/lufa' (https://github.com/qmk/lufa) registered for path 'lib/lufa'
Submodule 'lib/pico-sdk' (https://github.com/qmk/pico-sdk.git) registered for path 'lib/pico-sdk'
Submodule 'lib/printf' (https://github.com/qmk/printf) registered for path 'lib/printf'
Submodule 'lib/vusb' (https://github.com/qmk/v-usb) registered for path 'lib/vusb'
Cloning into '/mnt/projects/sources/qmk_firmware/lib/chibios'...
remote: Enumerating objects: 255179, done.        
remote: Counting objects: 100% (13923/13923), done.        
remote: Compressing objects: 100% (5224/5224), done.        
remote: Total 255179 (delta 9299), reused 12477 (delta 8354), pack-reused 241256        
Receiving objects: 100% (255179/255179), 169.54 MiB | 11.19 MiB/s, done.
Resolving deltas: 100% (193342/193342), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/chibios-contrib'...
remote: Enumerating objects: 23254, done.        
remote: Counting objects: 100% (270/270), done.        
remote: Compressing objects: 100% (160/160), done.        
remote: Total 23254 (delta 125), reused 232 (delta 107), pack-reused 22984        
Receiving objects: 100% (23254/23254), 9.72 MiB | 3.61 MiB/s, done.
Resolving deltas: 100% (14837/14837), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/googletest'...
remote: Enumerating objects: 22998, done.        
remote: Total 22998 (delta 0), reused 0 (delta 0), pack-reused 22998        
Receiving objects: 100% (22998/22998), 8.96 MiB | 12.49 MiB/s, done.
Resolving deltas: 100% (16989/16989), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/lufa'...
remote: Enumerating objects: 76748, done.        
remote: Counting objects: 100% (3098/3098), done.        
remote: Compressing objects: 100% (73/73), done.        
remote: Total 76748 (delta 3049), reused 3031 (delta 3025), pack-reused 73650        
Receiving objects: 100% (76748/76748), 18.93 MiB | 3.80 MiB/s, done.
Resolving deltas: 100% (61670/61670), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/pico-sdk'...
remote: Enumerating objects: 6628, done.        
remote: Total 6628 (delta 0), reused 0 (delta 0), pack-reused 6628        
Receiving objects: 100% (6628/6628), 2.57 MiB | 6.35 MiB/s, done.
Resolving deltas: 100% (3469/3469), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/printf'...
remote: Enumerating objects: 1578, done.        
remote: Counting objects: 100% (627/627), done.        
remote: Compressing objects: 100% (100/100), done.        
remote: Total 1578 (delta 568), reused 538 (delta 522), pack-reused 951        
Receiving objects: 100% (1578/1578), 793.98 KiB | 4.59 MiB/s, done.
Resolving deltas: 100% (979/979), done.
Cloning into '/mnt/projects/sources/qmk_firmware/lib/vusb'...
remote: Enumerating objects: 1372, done.        
remote: Counting objects: 100% (73/73), done.        
remote: Compressing objects: 100% (50/50), done.        
remote: Total 1372 (delta 32), reused 46 (delta 18), pack-reused 1299        
Receiving objects: 100% (1372/1372), 476.46 KiB | 2.92 MiB/s, done.
Resolving deltas: 100% (832/832), done.
Submodule path 'lib/chibios': checked out '0e9d558b525a8f28285f3bb509fd48a897c43151'
Submodule path 'lib/chibios-contrib': checked out 'bb8356fb5a3a9bbc1561826f174a9a631c614546'
Submodule 'ext/mcux-sdk' (https://github.com/NXPmicro/mcux-sdk) registered for path 'lib/chibios-contrib/ext/mcux-sdk'
Cloning into '/mnt/projects/sources/qmk_firmware/lib/chibios-contrib/ext/mcux-sdk'...
remote: Enumerating objects: 43478, done.        
remote: Counting objects: 100% (8345/8345), done.        
remote: Compressing objects: 100% (2770/2770), done.        
remote: Total 43478 (delta 5515), reused 8229 (delta 5489), pack-reused 35133        
Receiving objects: 100% (43478/43478), 98.27 MiB | 26.47 MiB/s, done.
Resolving deltas: 100% (29935/29935), done.
Submodule path 'lib/chibios-contrib/ext/mcux-sdk': checked out '102c27d7cc2aaac87c133702e7829a105e0cb433'
Submodule path 'lib/googletest': checked out 'e2239ee6043f73722e7aa812a459f54a28552929'
Submodule path 'lib/lufa': checked out '549b97320d515bfca2f95c145a67bd13be968faa'
Submodule path 'lib/pico-sdk': checked out '8d56ea332b3734cef0a8e61f7d61f2422bd539b1'
Submodule path 'lib/printf': checked out 'c2e3b4e10d281e7f0f694d3ecbd9f320977288cc'
Submodule path 'lib/vusb': checked out '819dbc1e5d5926b17e27e00ca6d3d2988adae04e'

stratos@iocaine 
…/qmk_firmware [ miryoku] [🐍 v3.10.10] [⍱ v2.3.4] [⏱ 48s ] 
➜  git checkout -b miryoku-merge-master
Switched to a new branch 'miryoku-merge-master'

stratos@iocaine 
…/qmk_firmware [ miryoku-merge-master] [🐍 v3.10.10] [⍱ v2.3.4] 
❯ git revert --no-edit `git log --grep='^\[miryoku-github\]' --pretty='format:%H' | tr '\n' ' '`
[miryoku-merge-master b8957d0bbf] Revert "[miryoku-github] Fix merge in workflow (#16)"
 Date: Fri Apr 7 17:58:59 2023 +0200
 1 file changed, 1 deletion(-)
[miryoku-merge-master b8a18ead90] Revert "[miryoku-github] Fix make git-submodule in workflow"
 Date: Fri Apr 7 17:58:59 2023 +0200
 1 file changed, 1 insertion(+), 3 deletions(-)
[miryoku-merge-master 60a7a0c6cc] Revert "[miryoku-github] Add choice to Build Inputs workflow for alternative layout options"
 Date: Fri Apr 7 17:58:59 2023 +0200
 2 files changed, 113 deletions(-)
 delete mode 100644 .github/workflows/test-inputs.yml
[miryoku-merge-master 8834067176] Revert "[miryoku-github] Update actions/upload-artifact in workflow"
 Date: Fri Apr 7 17:58:59 2023 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
[miryoku-merge-master 4fd34a5160] Revert "[miryoku-github] Squashed local commits from previous miryoku branch"
 Date: Fri Apr 7 17:58:59 2023 +0200
 13 files changed, 362 deletions(-)
 delete mode 100644 .github/FUNDING.yml
 delete mode 100644 .github/workflows/build-example-contra.yml
 delete mode 100644 .github/workflows/build-example-crkbd.yml
 delete mode 100644 .github/workflows/build-example-ergodox_ez.yml
 delete mode 100644 .github/workflows/build-example-keebio_levinson.yml
 delete mode 100644 .github/workflows/build-example-planck_rev6.yml
 delete mode 100644 .github/workflows/build-example-xmk.yml
 delete mode 100644 .github/workflows/build-inputs.yml
 delete mode 100644 .github/workflows/main.yml
 delete mode 100644 .github/workflows/test-all-configs.yml
 delete mode 100644 .github/workflows/test-build.yml
 delete mode 100644 .github/workflows/test-merge.yml
 delete mode 100644 readme.org
[miryoku-merge-master d648132511] Revert "[miryoku-github] Delete upstream github files"
 Date: Fri Apr 7 17:58:59 2023 +0200
 22 files changed, 731 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
 create mode 100644 .github/ISSUE_TEMPLATE/other_issues.yml
 create mode 100644 .github/ISSUE_TEMPLATE/zzz_blank.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/api.yml
 create mode 100644 .github/workflows/auto_approve.yml
 create mode 100644 .github/workflows/auto_tag.yml
 create mode 100644 .github/workflows/cli.yml
 create mode 100644 .github/workflows/develop_update.yml
 create mode 100644 .github/workflows/docs.yml
 create mode 100644 .github/workflows/feature_branch_update.yml
 create mode 100644 .github/workflows/format.yml
 create mode 100644 .github/workflows/format_push.yml
 create mode 100644 .github/workflows/labeler.yml
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/stale.yml
 create mode 100644 .github/workflows/unit_test.yml
 create mode 100644 readme.md

stratos@iocaine 
…/qmk_firmware [ miryoku-merge-master] [🐍 v3.10.10] [⍱ v2.3.4] 
➜  git fetch origin

stratos@iocaine 
…/qmk_firmware [ miryoku-merge-master] [🐍 v3.10.10] [⍱ v2.3.4] [⏱ 2s ] 
➜  git merge origin/master
Auto-merging users/manna-harbour_miryoku/manna-harbour_miryoku.c
CONFLICT (content): Merge conflict in users/manna-harbour_miryoku/manna-harbour_miryoku.c
Automatic merge failed; fix conflicts and then commit the result.

Manna Harbour · Answer 1 · Sat Apr 08 2023 07:00:07 GMT+0800 (China Standard Time)

The miryoku branch needs rebasing, but for local builds QMK master should be up to date at the moment, so you can just build from QMK master directly.

Manna Harbour · Answer 2 · Wed Sep 13 2023 19:33:16 GMT+0800 (China Standard Time)

The miryoku branch has been rebased and now merges cleanly with QMK master. Here's a sample build run: https://github.com/manna-harbour/miryoku_qmk/actions/runs/6171714664.