Re: After osc commit: Files could not be expanded: service error: bad link: conflict in file <file.spec>

Hi, On 2021-12-14 14:38:09 +0100, Michael Pujos wrote:

I have pushed a commit to this package:

https://build.opensuse.org/package/show/multimedia:apps/upmpdcli

The web interface reports:

Files could not be expanded: service error: bad link: conflict in file upmpdcli.spec

I have no idea how this error happened and how to fix it. I just modified like 2 lines in upmpdcli.spec.

Any help ?

Run "osc pull" inside the the checked out package, fix the conflicts (see "osc st" for files that have a conflict ("C")), run "osc resolved ..." and commit the changes via "osc ci". Marcus