emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Óscar Fuentes
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 20:21:58 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) 
Andreas Schwab <address@hidden> writes:

> Óscar Fuentes <address@hidden> writes:
>
>> the merged branch is recreated
>
> What does that mean?

You branch from trunk on a way that the result is the branch which was
merged into trunk. For instance, for re-creating the branch that Jan
D. merged into trunk in revision 99383:

bzr branch -r revid:address@hidden trunk jan-99383
reply via email to
[Prev in Thread] Current Thread [Next in Thread]