Mailinglist Archive: opensuse-buildservice (117 mails)

< Previous Next >
Re: [opensuse-buildservice] how to fix "broken: conflict in file"
On Mon, 2016-07-25 at 09:37 +0200, Olaf Hering wrote:
Am 25. Juli 2016 09:18:42 MESZ, schrieb Dominique Leuenberger /
DimStar <dimstar@xxxxxxxxxxxx>:

done that - seems like somebody was working on an unexpanded
checkout... but fixing this kind of issue is not really difficult:

But how can that happen anyway, osc commit would spot the
I did run osc up -u before. 
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.

< Previous Next >
Follow Ups