Re: merging emacs-24

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Fri, 28 Nov 2014 12:29:02 +0900
> 
> Stephen J. Turnbull writes:
>  > David Engster writes:
> 
>  >  > I think the easiest way to avoid this is to merge the remote branch
>  >  > instead of the local tracking one.
>  > 
>  > It is mathematically impossible to merge a remote branch,
> 
> Oops, did you mean "git pull" here?

I think he meant merging origin/emacs-24 after "git pull", as opposed
to merging emacs-24 (which requires "git checkout" followed by "git pull").