From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: "Untracked working tree file" error with git pull Date: Wed, 9 Apr 2008 10:41:40 +0200 Message-ID: <19F2D337-8BC8-4B3D-8ECC-B8B9FF261CB4@science.uva.nl> References: Mime-Version: 1.0 (Apple Message framework v919.2) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JjVsM-0001tu-LC for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 04:41:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JjVsJ-0001qY-RV for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 04:41:49 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JjVsJ-0001q8-K7 for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 04:41:47 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JjVsJ-0000Cd-0s for emacs-orgmode@gnu.org; Wed, 09 Apr 2008 04:41:47 -0400 Received: by fg-out-1718.google.com with SMTP id d23so3461583fga.30 for ; Wed, 09 Apr 2008 01:41:44 -0700 (PDT) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Manish Cc: emacs-orgmode Mailinglist 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. - Carsten On Apr 9, 2008, at 8:43 AM, Manish wrote: > 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 > > > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode