Re: How to merge FETCH_HEAD?
Show 16 quoted lines
> Quoting Junio C Hamano <junkio@cox.net>:
> Subject: Re: How to merge FETCH_HEAD?
>
> "Michael S. Tsirkin" <mst@mellanox.co.il> writes:
>
> >> No. FETCH_HEAD is local. And for local merges, you should use git-merge,
> >> not git-pull.
> >
> > But, that can not take FETCH_HEAD either.
> > Would it be useful for git-merge FETCH_HEAD to work?
>
> Please try again, starting from the "git fetch".
>
> I suspect the reason you think "merge FETCH_HEAD" does not work
> is because you lost FETCH_HEAD when you did "git pull . FETCH_HEAD",
> as I explained to you in an earlier message.
Yes, that was it, thanks!
--
MST