git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: git@vger.kernel.org
Subject: renaming a file into a directory causes a pull error on older repos
Date: Sat, 15 Mar 2008 21:31:38 -0700	[thread overview]
Message-ID: <20080316043138.GA7942@kroah.com> (raw)

So I had heard from someone else that this was a problem with git, but
brushed it off as something that no one "normal" would ever run into.
Well, I did tonight.

The problem:
  If you turn a file in a repository into a directory, and place files
  in that dir and commit it, any other person who had that repo cloned
  somewhere else will get an error when they try to pull and update
  their version.

The error for me is:
	fatal: Entry 'stats/results-18-22.txt' would be overwritten by merge. Cannot merge.
	Merge with strategy recursive failed.

I had turned the file "stats" into a directory.

So, any thoughts as to how to solve this for real?  It's trivial to just
blow away this repo and clone it again, which will solve the issue for
now, but it seems like this might be good to get fixed...

thanks,

greg k-h

             reply	other threads:[~2008-03-16  4:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-16  4:31 Greg KH [this message]
2008-03-18  0:16 ` renaming a file into a directory causes a pull error on older repos Junio C Hamano
2008-03-18  0:48   ` [PATCH] git-merge-one-file: fix longstanding stupid thinko Junio C Hamano
2008-03-19  1:51   ` renaming a file into a directory causes a pull error on older repos Greg KH
2008-03-19  6:31     ` Junio C Hamano

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=20080316043138.GA7942@kroah.com \
    --to=greg@kroah.com \
    --cc=git@vger.kernel.org \
    /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).