Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: How to merge FETCH_HEAD?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:49

"Michael S. Tsirkin" [off-list ref] writes:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help