[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

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
[Tue Dec 28 01:30:06 CET 2021] Preparation for dev build failed