Mailinglist Archive: opensuse-buildservice (256 mails)

< Previous Next >
Re: [opensuse-buildservice] conflict in spec
On 08/12/2011 10:33 AM, Marcus Meissner wrote:

The package is linked to factory, so it need merging if it changes in factory.
Usually changes are automerged.

That I thought

When doing a osc pull it should have a in current working directory
files with conflicts that you then can resolve.

(edit the file with conflicts, then "osc resolved filename" then "osc ci"
when all are done)

Thanks I knew this part but at least it confirmed what I was doing is
right :)

To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >