Mailinglist Archive: opensuse-buildservice (132 mails)

< Previous Next >
`~Re: [opensuse-buildservice] Unresolvable conflict
Thanks, Dominique! I'll keep this on my notes.


Dimstar / Dominique Leuenberger <dimstar@xxxxxxxxxxxx> 12/01/15 18:14 >>>
<snip>
Erico,

I fixed it for you, like this:

osc co devel:languages:misc/ooRexx
cd devel:languages:misc/ooRexx
osc pull #this is the one merging conflicts
vi ooRex.changed # User your favorite editor
osc resolved ooRex.changes # Mark the conflict as resolved
osc ci -m 'Resolve conflict'

Hope this helps you for the next time around.

Cheers,
Dominique
--
Dimstar / Dominique Leuenberger <dimstar@xxxxxxxxxxxx>

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




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

< Previous Next >