[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   ca8685b..5454f7c  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	scripts/release-artifacts/extra-testing-images.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating ca8685b..5454f7c
[Wed Oct 14 01:30:05 CEST 2020] Preparation for dev build failed