[dss-merge-requests] Dev build failure
oebuild at builder.localdomain
oebuild at builder.localdomain
Mon Mar 30 09:50:25 CEST 2020
>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
446c73b..56774da master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
targets/devel/rootfs/common.inc
Please, commit your changes or stash them before you can merge.
Aborting
Updating 446c73b..56774da
[pon, 30 mar 2020, 09:50:24 CEST] Preparation for dev build failed
More information about the dSS-merge-requests
mailing list