[oe] merge mutiple heads...

[Justin Patrin]

On Tue, Apr 29, 2008 at 5:11 PM, Leon Woestenberg
<leon.woestenberg at gmail.com> wrote:
> Hello,
>
>
>  On Tue, Apr 29, 2008 at 10:37 PM, Johannes Paechnatz
>  <jpaechnatz at gmail.com> wrote:
>  >  when I try to checkout org.openembedded.dev I get the following error...
>  >
>  >  mtn: Zweig org.openembedded.dev hat mehrere Köpfe:
>  >  mtn:   1a467a7ea8dfd7463354c140383975aa0b8b20e8
>  >  freyther at openembedded.org 2008-04-25T15:51:39
>  >  mtn:   60d4d904e10f8212b1c2242377b31ccc2e29e374
>  >  freyther at openembedded.org 2008-04-25T15:03:16
>  >  mtn: wählen Sie einen durch 'mtn checkout -r<id>'
>  >  mtn: Fehler: Zweig org.openembedded.dev hat mehrere Köpfe
>  >
>  Either synchronize again, say 15 minutes later, and the server will
>  have run a auto-merge of the heads.
>
>  Or, run mtn --db=OE.db merge yourself.

Or just choose one of the heads and use -r to check it out. Later once
it's merged you'll still be able to update just fine.

-- 
Justin Patrin