You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
lwm2m: Regenerate lwm2m_senml code from the CDDL description.
Reapply manual changes.
Create a sh script to perform the regeneration.
tests: zcbor_bulk: Adapt to zcbor 0.5.1
zcbor_new_decode_state() now has no return value.
Signed-off-by: Øyvind Rønningstad <[email protected]>
The above command also applies the lwm2m_senml_cbor.patch patch file.
23
+
If the patch fails to apply, you can attempt to use the 3-way merge capabilities by committing the un-patched changes (i.e. up to and including the clang-format), and the running
24
+
25
+
```console
26
+
git am -3 < lwm2m_senml_cbor.patch
27
+
```
28
+
29
+
The patch was created by, committing the unpatched changes, then committing the desired patches in a subsequent commit, then creating the patch file with the command
0 commit comments