[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   82e1416..9e42c71  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	buildyoctofeed
	cleanyoctopackage
Please, commit your changes or stash them before you can merge.
Aborting
Updating 82e1416..9e42c71
[Wed Dec  2 11:30:05 CET 2020] Preparation for dev build failed