esp-at 3.2.0.0 build fatal error git merge failed
Posted: Tue May 27, 2025 10:49 pm
Following the instructions in the documentation https://docs.espressif.com/projects/esp ... le_it.html I get this
The recommended fix doesn't help:
The esp-at build patched dhcpserver.c in esp-idf and then calls it a fatal error.A fatal error occurred: git merge failed! Please manually run:
cd esp-idf && git merge origin/release/v5.0 release/v5.0
The recommended fix doesn't help:
Any ideas?cd esp-idf && git merge origin/release/v5.0 release/v5.0
/Users/roger/esp/esp-at-3.2.0.0/esp-idf
Updating 24b9d38a24..d9f9b7d8ed
error: Your local changes to the following files would be overwritten by merge:
components/lwip/apps/dhcpserver/dhcpserver.c
Please commit your changes or stash them before you merge.
Aborting