From mboxrd@z Thu Jan  1 00:00:00 1970
From: Manish <mailtomanish.sharma@gmail.com>
Subject: "Untracked working tree file" error with git pull
Date: Wed, 9 Apr 2008 12:13:39 +0530
Message-ID: <e7cdbe30804082343m22e06ac9oe7f6631de83ed8cf@mail.gmail.com>
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 1JjUBl-00051H-ET
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 02:53:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JjUBj-0004zK-Ng
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 02:53:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JjUBj-0004z7-AK
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 02:53:43 -0400
Received: from ti-out-0910.google.com ([209.85.142.186])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mailtomanish.sharma@gmail.com>) id 1JjUBi-0006ht-Pd
	for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 02:53:43 -0400
Received: by ti-out-0910.google.com with SMTP id a20so970892tia.10
	for <emacs-orgmode@gnu.org>; Tue, 08 Apr 2008 23:53:39 -0700 (PDT)
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: emacs-orgmode Mailinglist <emacs-orgmode@gnu.org>

Hello,

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