[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   baf8a23..931c2f0  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	buildyoctofeed
Please, commit your changes or stash them before you can merge.
Aborting
Updating baf8a23..931c2f0
[Tue Oct 23 03:30:08 CEST 2018] Preparation for dev build failed