[dss-merge-requests] Dev build failure
oebuild at builder.localdomain
oebuild at builder.localdomain
Thu Dec 23 01:30:07 CET 2021
>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
b135fff..525d6c8 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
yocto/dS/meta-digitalstrom-devel/recipes-core/images/digitalstrom-swupdate-image.bb
Please, commit your changes or stash them before you can merge.
Aborting
Updating b135fff..525d6c8
[Thu Dec 23 01:30:07 CET 2021] Preparation for dev build failed
More information about the dSS-merge-requests
mailing list