From: Manish <mailtomanish.sharma@gmail.com>
To: emacs-orgmode Mailinglist <emacs-orgmode@gnu.org>
Subject: "Untracked working tree file" error with git pull
Date: Wed, 9 Apr 2008 12:13:39 +0530 [thread overview]
Message-ID: <e7cdbe30804082343m22e06ac9oe7f6631de83ed8cf@mail.gmail.com> (raw)
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
next reply other threads:[~2008-04-09 6:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 6:43 Manish [this message]
2008-04-09 8:41 ` "Untracked working tree file" error with git pull Carsten Dominik
2008-04-09 14:03 ` Manish
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e7cdbe30804082343m22e06ac9oe7f6631de83ed8cf@mail.gmail.com \
--to=mailtomanish.sharma@gmail.com \
--cc=emacs-orgmode@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).