[dss-merge-requests] Dev build failure
oebuild at builder.localdomain
oebuild at builder.localdomain
Sat Apr 2 17:16:47 CEST 2022
>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
2fb6d8f..73f7725 master -> origin/master
d61c8d0..9f685db MR_prepare_alpha -> origin/MR_prepare_alpha
* [new branch] MR_trim_extra_images -> origin/MR_trim_extra_images
error: Your local changes to the following files would be overwritten by merge:
scripts/dailydev.sh
scripts/stage-release-artifacts.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating 2fb6d8f..73f7725
[Sa 2. Apr 17:16:47 CEST 2022] Preparation for dev build failed
More information about the dSS-merge-requests
mailing list