[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   f73f0d6..4cbef86  master     -> origin/master
   152aa51..4b997c1  MR_prepare_alpha -> origin/MR_prepare_alpha
error: Your local changes to the following files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-testing/recipes-digitalstrom/dss/dss.inc
Please, commit your changes or stash them before you can merge.
Aborting
Updating f73f0d6..4cbef86
[Fri Nov  4 01:30:07 CET 2022] Preparation for dev build failed