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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Alexander Litvinov <litvinov2004@...>
Cc: <git@...>
Date: Thursday, November 16, 2006 - 7:32 am

"Alexander Litvinov" <litvinov2004@gmail.com> writes:


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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Git can't merge two identical move file operation, Alexander Litvinov, (Thu Nov 16, 6:26 am)
Re: Git can't merge two identical move file operation, Junio C Hamano, (Thu Nov 16, 7:32 am)
Re: Git can't merge two identical move file operation, Alexander Litvinov, (Thu Nov 16, 8:25 am)
Re: Git can't merge two identical move file operation, Alexander Litvinov, (Thu Nov 16, 8:23 am)
Re: Git can't merge two identical move file operation, Alexander Litvinov, (Thu Nov 16, 8:14 am)