[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   3b586a2..d8a37fb  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	scripts/check-tmpdir-space.sh
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
	scripts/mrpoper-tmpdir.sh
Please move or remove them before you can merge.
Aborting
Updating 3b586a2..d8a37fb
[Wed Jan 29 03:30:17 CET 2020] Preparation for dev build failed