c:\esp-idf>git fetch -a remote: Enumerating objects: 31992, done. remote: Counting objects: 100% (16175/16175), done. remote: Compressing objects: 100% (1461/1461), done. remote: Total 31992 (delta 14753), reused 15981 (delta 14601), pack-reused 15817Receiving objects: 100% (31992/31992), 5Receiving objects: 100% (31992/31992), 12.22 MiB | 13.38 MiB/s, done. Resolving deltas: 100% (22354/22354), completed with 3780 local objects. From https://github.com/espressif/esp-idf b4268c874a..b3f7e2c8a4 master -> origin/master 2b6ebac5ca..3a71941503 release/v4.3 -> origin/release/v4.3 5f257494c5..bb8dd9d35b release/v4.4 -> origin/release/v4.4 f333925342..209a0361c0 release/v5.0 -> origin/release/v5.0 8c6114d0d2..db1e54a0c5 release/v5.1 -> origin/release/v5.1 * [new branch] release/v5.2 -> origin/release/v5.2 * [new tag] v4.3.7 -> v4.3.7 * [new tag] v5.0.5 -> v5.0.5 * [new tag] v5.1.2 -> v5.1.2 * [new tag] v5.2-beta1 -> v5.2-beta1 * [new tag] v5.3-dev -> v5.3-dev Fetching submodule components/bt/controller/lib_esp32 From https://github.com/espressif/esp32-bt-lib 089f00b..7ef2b1d master -> origin/master Fetching submodule components/bt/controller/lib_esp32c2/esp32c2-bt-lib From https://github.com/espressif/esp32c2-bt-lib ea33fba..909c8bc main -> origin/main Fetching submodule components/bt/controller/lib_esp32c3_family From https://github.com/espressif/esp32c3-bt-lib af6be40..393ac4c master -> origin/master 55c09d0..c6ddd0d release/v4.3 -> origin/release/v4.3 Fetching submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib From https://github.com/espressif/esp32c6-bt-lib 105cd9a..300c68e main -> origin/main Fetching submodule components/bt/controller/lib_esp32h2/esp32h2-bt-lib From https://github.com/espressif/esp32h2-bt-lib c801810..49a90d0 master -> origin/master Fetching submodule components/bt/host/nimble/nimble From https://github.com/espressif/esp-nimble bdf2c758..e1b6de0c nimble-1.3.0-idf -> origin/nimble-1.3.0-idf d8f6a3bd..d2cb8370 nimble-1.4.0-idf -> origin/nimble-1.4.0-idf b85d99de..20d3df32 nimble-1.5.0-idf -> origin/nimble-1.5.0-idf Fetching submodule components/esp_coex/lib From https://github.com/espressif/esp-coex-lib 68cbbdb..667353c main -> origin/main Fetching submodule components/esp_phy/lib From https://github.com/espressif/esp-phy-lib 9af837d..b5d8d9b master -> origin/master 32583f9..47707e6 release/v4.4 -> origin/release/v4.4 086ac00..55a63e0 release/v5.0 -> origin/release/v5.0 Fetching submodule components/esp_wifi/lib From https://github.com/espressif/esp32-wifi-lib ee1f0c43..b4991a9d master -> origin/master fe03953f..553ce7df release/v4.3 -> origin/release/v4.3 c9d122fc..ef921a2f release/v4.4 -> origin/release/v4.4 fcfd486e..9bb0eb78 release/v5.0 -> origin/release/v5.0 * [new branch] release/v5.1 -> origin/release/v5.1 Fetching submodule components/lwip/lwip From https://github.com/espressif/esp-lwip 90c1e93e..1de11efa 2.1.2-esp -> origin/2.1.2-esp 6bf7044c..f5c43549 2.1.3-esp -> origin/2.1.3-esp Fetching submodule components/openthread/lib From https://github.com/espressif/esp-thread-lib ca32b65..ab0d2a8 master -> origin/master Fetching submodule components/openthread/openthread From https://github.com/espressif/openthread 7074a43e4..b28bb1d1e main -> origin/main Fetching submodule components/unity/unity From https://github.com/ThrowTheSwitch/Unity b175905..b4f6557 master -> origin/master a7639ee..a1b1600 platform_matrix -> origin/platform_matrix * [new tag] v2.6.0_RC1 -> v2.6.0_RC1 Could not access submodule 'components/bt/esp_ble_mesh/lib/lib' at commit d3a78fef1b Could not access submodule 'components/nghttp/nghttp2' at commit e6330d9cdc fatal: remote error: upload-pack: not our ref 04b38e68fdf662cc866fca628e3e67a9714209d1 fatal: remote error: upload-pack: not our ref e1ba2bd2f61cd81c16b31b09772967fbfd72edd2 fatal: remote error: upload-pack: not our ref 11aa66e7f39c9402039882acb14a993e390f8893 fatal: remote error: upload-pack: not our ref 848df55b08dcdad33c7dd9dbc25deacd2fc5e489 fatal: remote error: upload-pack: not our ref 30e5c4f95bff1a17e06ce1042a165b0aa2bc4ca5 Errors during submodule fetch: components/lwip/lwip components/esp_wifi/lib components/bt/controller/lib_esp32h2/esp32h2-bt-lib components/bt/controller/lib_esp32c6/esp32c6-bt-lib components/bt/controller/lib_esp32c2/esp32c2-bt-lib c:\esp-idf>git describe v5.2-dev-3775-gb4268c874a c:\esp-idf>git cherry-pick bb7544e Auto-merging components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h CONFLICT (content): Merge conflict in components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h Auto-merging components/bootloader_support/bootloader_flash/include/bootloader_flash_priv.h CONFLICT (content): Merge conflict in components/bootloader_support/bootloader_flash/include/bootloader_flash_priv.h Auto-merging components/bootloader_support/bootloader_flash/src/bootloader_flash.c CONFLICT (content): Merge conflict in components/bootloader_support/bootloader_flash/src/bootloader_flash.c Auto-merging components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c CONFLICT (content): Merge conflict in components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c Auto-merging components/esp_rom/patches/esp_rom_spiflash.c Auto-merging components/spi_flash/Kconfig CONFLICT (content): Merge conflict in components/spi_flash/Kconfig error: could not apply bb7544e65a... fix(ota): Fixed OTA fail on octal flash with 32MB memory, hint: After resolving the conflicts, mark them with hint: "git add/rm ", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". c:\esp-idf>git cherry-pick 8f6213c9 error: Cherry-picking is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed c:\esp-idf>