25 Jul
2016
25 Jul
'16
07:44
Am 25. Juli 2016 09:18:42 MESZ, schrieb Dominique Leuenberger / DimStar
: 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 inconsistency. I did run osc up -u before. When you work on 'osc -u', then you take control over the 'unmerged'
On Mon, 2016-07-25 at 09:37 +0200, Olaf Hering wrote: 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. Cheers, Dominique