* "Untracked working tree file" error with git pull
@ 2008-04-09 6:43 Manish
2008-04-09 8:41 ` Carsten Dominik
0 siblings, 1 reply; 3+ messages in thread
From: Manish @ 2008-04-09 6:43 UTC (permalink / raw)
To: emacs-orgmode Mailinglist
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "Untracked working tree file" error with git pull
2008-04-09 6:43 "Untracked working tree file" error with git pull Manish
@ 2008-04-09 8:41 ` Carsten Dominik
2008-04-09 14:03 ` Manish
0 siblings, 1 reply; 3+ messages in thread
From: Carsten Dominik @ 2008-04-09 8:41 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "Untracked working tree file" error with git pull
2008-04-09 8:41 ` Carsten Dominik
@ 2008-04-09 14:03 ` Manish
0 siblings, 0 replies; 3+ messages in thread
From: Manish @ 2008-04-09 14:03 UTC (permalink / raw)
To: Carsten Dominik; +Cc: emacs-orgmode Mailinglist
> > 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-04-09 14:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-09 6:43 "Untracked working tree file" error with git pull Manish
2008-04-09 8:41 ` Carsten Dominik
2008-04-09 14:03 ` Manish
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.