git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Litvinov <litvinov2004@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Git can't merge two identical move file operation
Date: Thu, 16 Nov 2006 18:23:38 +0600	[thread overview]
Message-ID: <200611161823.39056.litvinov2004@gmail.com> (raw)
In-Reply-To: <7v1wo3bp99.fsf@assigned-by-dhcp.cox.net>

В сообщении от 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.


  parent reply	other threads:[~2006-11-16 12:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-16 10:26 Git can't merge two identical move file operation Alexander Litvinov
2006-11-16 11:32 ` Junio C Hamano
2006-11-16 12:14   ` Alexander Litvinov
2006-11-16 12:23   ` Alexander Litvinov [this message]
2006-11-16 12:25   ` Alexander Litvinov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200611161823.39056.litvinov2004@gmail.com \
    --to=litvinov2004@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).