From mboxrd@z Thu Jan  1 00:00:00 1970
From: Manish <mailtomanish.sharma@gmail.com>
Subject: Re: "Untracked working tree file" error with git pull
Date: Wed, 9 Apr 2008 19:33:31 +0530
Message-ID: <e7cdbe30804090703t5eda7a4bn290d89f0ce6c5615@mail.gmail.com>
References: <e7cdbe30804082343m22e06ac9oe7f6631de83ed8cf@mail.gmail.com>
	<19F2D337-8BC8-4B3D-8ECC-B8B9FF261CB4@science.uva.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Jjatk-0002Rx-5G
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 10:03:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Jjati-0002R5-Cm
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 10:03:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Jjati-0002R0-5I
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 10:03:34 -0400
Received: from ti-out-0910.google.com ([209.85.142.184])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mailtomanish.sharma@gmail.com>) id 1Jjath-0002Uc-GV
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 10:03:33 -0400
Received: by ti-out-0910.google.com with SMTP id a20so1007255tia.10
	for <emacs-orgmode@gnu.org>; Wed, 09 Apr 2008 07:03:31 -0700 (PDT)
In-Reply-To: <19F2D337-8BC8-4B3D-8ECC-B8B9FF261CB4@science.uva.nl>
Content-Disposition: inline
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Carsten Dominik <dominik@science.uva.nl>
Cc: emacs-orgmode Mailinglist <emacs-orgmode@gnu.org>

    > > While trying to get my latest org-mode fix from git this is what I
    > > got.
    > >
    > >   ,----
    > >   | lappy:~/elisp/org-mode $ time git pull
    > >   | Updating 2537ddc..862f6cb
    > >   | fatal: Untracked working tree file 'contrib/ChangeLog' would be
    > > overwritten by merge.
    > >   |
    > >   | real    0m8.943s
    > >   | user    0m1.140s
    > >   | sys     0m1.370s
    > >   | lappy:~/elisp/org-mode $ git branch
    > >   | * master
    > >   | lappy:~/elisp/org-mode $ date
    > >   | Wed Apr  9 11:57:14 IST 2008
    > >   `----
    > >
    > > I renamed `CONTRIB/ChangeLog' to `CONTRIB/ChangeLog.old' and tried
    > > again and this time it complained about `contrib/README'.  Are the
    > > errors because of something I did?  I do not create or otherwise edit
    > > any files apart from regular `make' and `texi2html org.texi'.  I tried
    > > `git checkout -f' to no avail.  Any suggestions? Or do I have to do a
    > > fresh clone?
    > >
    > > OS: WinXP+Cygwin
    > > git version 1.5.4.34.g053d9
    > > Emacs 22.2.1
    > >
    > > -- Manish
    > >

  On Wed, Apr 9, 2008 at 2:11 PM, Carsten Dominik wrote:
  > I believe this may be caused by the fact that I have renamed CONTRIB to
  > contrib.
  >  On a system which has no distinction between upper and lowercase names,
  > maybe this leads
  >  to a conflict?
  >
  >  Try removing the entire CONTRIB directory.  If that fails, try to get a new
  > clone of the repo.

This fixed it.  Thanks.

-- Manish