[dss-merge-requests] Dev build failure

[oebuild at]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   e30b6d9..a628dc4  master     -> origin/master
error: cannot stat 'yocto/dS': Permission denied
error: Your local changes to the following files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-devel/recipes-rescue/rescue-utils/rescue-utils_1.0.bb
Please, commit your changes or stash them before you can merge.
Aborting
Updating e30b6d9..a628dc4
[Tue Feb 28 15:21:45 CET 2017] Preparation for dev build failed