[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   60bda70..24c2465  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	scripts/rsync-rootfs-feed.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating 60bda70..24c2465
[Mon Oct 28 11:30:06 CET 2019] Preparation for dev build failed