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
_______________________________________________
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
