michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lwm2m_senml_cbor_regenerate.sh: Use git am instead of git apply

Browse source 
Since it's better at resolving conflicts.
Commit regenerated files before applying patch.

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
This commit is contained in:
Øyvind Rønningstad 2022-10-12 15:44:56 +02:00 • committed by Carles Cufí
commit f8d0c8a43f
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh
View file

@ -10,4 +10,7 @@ clang-format -i \
lwm2m_senml_cbor_encode.c lwm2m_senml_cbor_encode.h \ lwm2m_senml_cbor_encode.c lwm2m_senml_cbor_encode.h \
lwm2m_senml_cbor_types.h lwm2m_senml_cbor_types.h
git apply lwm2m_senml_cbor.patch git add -A
git commit -s -m"pre-patch"
git am -3 lwm2m_senml_cbor.patch