Mailinglist Archive: opensuse-buildservice (117 mails)

< Previous Next >
Re: [opensuse-buildservice] how to fix "broken: conflict in file"
Am 25. Juli 2016 09:44:34 MESZ, schrieb Dominique Leuenberger / DimStar
<dimstar@xxxxxxxxxxxx>:

When you work on 'osc -u', then you take control over the 'unmerged'
sources - it's up to you to ensure it can be merged; there is hardly
ever a reason to work on unmerged sources though. IT's basically only
useful to fix up broken linking to start with.

Is this new behavior? I have always done it that way. And what should be
merged anyway? The pkg in the devel prj is the master.

Olaf


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

< Previous Next >
Follow Ups