> > 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
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
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.
|
| real0m8.943s
| user
