
Thanks, Dominique! I'll keep this on my notes.
Dimstar / Dominique Leuenberger <dimstar@opensuse.org> 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@opensuse.org> -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org