[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   a0b75fa..5c7b438  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	setup-yocto.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating a0b75fa..5c7b438
[Wed Oct 28 14:30:03 CET 2020] Preparation for dev build failed