Re: Strange response after merge from upstream

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: =?iso-8859-1?Q?=D3scar?= Fuentes <address@hidden>,
>   address@hidden,  address@hidden
> Date: Wed, 02 Dec 2009 09:31:06 -0500
> 
> > Thanks, these two followed by "bzr merge --pull" seem to have solved
> > the issue.  I will use "merge --pull" from now on, as long as no
> > development goes on on quickfixes/, and see if it stays in sync.
> 
> If the branch ever diverges, you won't be able to use `pull' again until
> you `push' that branch's changes upstream.

Yes, of course.  But then I won't be surprised ;-)