From f8d0c8a43fc57c4e83261107ec50b4e4c722ff37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Wed, 12 Oct 2022 15:44:56 +0200 Subject: [PATCH] lwm2m_senml_cbor_regenerate.sh: Use git am instead of git apply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since it's better at resolving conflicts. Commit regenerated files before applying patch. Signed-off-by: Øyvind Rønningstad --- subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh index 287fdd1c01b..5061d8d5149 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh @@ -10,4 +10,7 @@ clang-format -i \ lwm2m_senml_cbor_encode.c lwm2m_senml_cbor_encode.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