Re: Git can't merge two identical move file operation

From: Alexander Litvinov <litvinov2004@gmail.com>
Date: 2006-11-16 23:14:55
В сообщении от Thursday 16 November 2006 17:32 Junio C Hamano написал(a):
> Could you try an exactly the same sequence except to make the
> initial contents of the file 'a' a bit more meaningful (I
> typically use COPYING file in git.git repository for something
> like this), by replacing the above "echo 1 > a ..." line with:
>
> 	$ cat COPYING >a && git add a && git commit -a -m '1'
>
> and see if it still breaks?  You do not need to change the later
> modification to the file (i.e. "echo 2 >>a"), but only the above
> single line change.

Wow, that a magic ! It works !

Thanks for help.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Nov 16 23:15:26 2006

This archive was generated by hypermail 2.1.8 : 2006-11-16 23:16:28 EST