Mailinglist Archive: opensuse-buildservice (117 mails)

< Previous Next >
Re: [opensuse-buildservice] how to fix "broken: conflict in file"
On Mon, Jul 25, 2016 at 03:54:00PM +0930, Simon Lees wrote:


On 07/25/2016 03:50 PM, Olaf Hering wrote:
How can a devel pkg have a conflict after a commit? How to fix it?

multimedia:libs/gstreamer-0_10 $ obs r -v
openSUSE_Tumbleweed x86_64 broken: conflict in file
gstreamer-0_10.changes

The pkg points to Factory, and the Factory pkg appearently links back to
the devel prj.

Olaf


I've had this with enlightenment packages a few times its pretty
annoying, someone with maintainer rights needs to checkout the package
using osc then manually resolve the conflicts.

osc up
osc pull
$EDITOR $FILE
resolve the conflict via editing the $FILE.
osc resolved $FILE
osc ci

Ciao, Marfcus

--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: opensuse-buildservice+owner@xxxxxxxxxxxx

< Previous Next >
References