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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Alexander Litvinov" <litvinov2004@xxxxxxxxx> writes:

> Here is the example script:
>>git version
> git version 1.4.4
>> mkdir 1 && cd 1 && git init-db
> defaulting to local storage area
>> echo 1 > a && git add a && git commit -a -m '1'
> Committing initial tree 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e

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.

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]