Mailinglist Archive: opensuse-buildservice (193 mails)
| < Previous | Next > |
Re: [opensuse-buildservice] osc: handling of conflicts
- From: Christian Boltz <opensuse@xxxxxxxxx>
- Date: Sun, 22 Apr 2007 15:25:18 +0200
- Message-id: <200704221525.19209@xxxxxxxxxxxxxxx>
Hello,
on Freitag, 20. April 2007, Dr. Peter Poeml wrote:
> On Fri, Apr 20, 2007 at 12:13:55PM +0200, Christian Boltz wrote:
> > How can I force osc to remove the conflicts flag and download the
> > file?
>
> Just as with svn,
(given you know it ;-))
> you need to call "osc resolve", after manually
> resolving the conflict.
OK, that worked. Thanks!
Sidenote:
IMHO it would be a good idea to list the conflicts on osc up
as a reminder.
Regards,
Christian Boltz
--
> aber wieso ist dann plötzlich Korn nicht mehr in der Leiste rechts
> unten zu finden?
Hae? Wo? Wie? Was? Das Korn, das das blinde Huhn gefunden hat? Und
in welcher Leiste war das zu finden? Ist vielleicht ein Leistenbruch
schuld? [> Matthias Staudinger und David Haller in suse-linux]
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx
on Freitag, 20. April 2007, Dr. Peter Poeml wrote:
> On Fri, Apr 20, 2007 at 12:13:55PM +0200, Christian Boltz wrote:
> > How can I force osc to remove the conflicts flag and download the
> > file?
>
> Just as with svn,
(given you know it ;-))
> you need to call "osc resolve", after manually
> resolving the conflict.
OK, that worked. Thanks!
Sidenote:
IMHO it would be a good idea to list the conflicts on osc up
as a reminder.
Regards,
Christian Boltz
--
> aber wieso ist dann plötzlich Korn nicht mehr in der Leiste rechts
> unten zu finden?
Hae? Wo? Wie? Was? Das Korn, das das blinde Huhn gefunden hat? Und
in welcher Leiste war das zu finden? Ist vielleicht ein Leistenbruch
schuld? [> Matthias Staudinger und David Haller in suse-linux]
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx
| < Previous | Next > |