Hi, Here is a copy of the udev repo I cloned some time ago: http://frugalware.org/~vmiklos/files/udev.tar.bz2 I did not modify it, so I thought a simple 'git pull' can update it. $ git pull Updating 661a0be..b6626d0 error: Untracked working tree file 'test/sys/class/misc/rtc/dev' would be removed by merge. Ok, let's clean the untracked files: $ git clean -x -d -f But it does not remove any file. $ git ls-files|grep test/sys/class/misc/rtc/dev test/sys/class/misc/rtc/dev So it seems git-clean is right. $ git pull -s resolve Updating 661a0be..b6626d0 error: Untracked working tree file 'test/sys/class/misc/rtc/dev' would be removed by merge. So it does not seem to be merge-recursive-related. Does somebody have an idea what's going on? :) $ git version git version 1.6.1.rc1.35.gae26e.dirty ('dirty' is due to non-code changes in my working directory.) Let me know if you need more details. Thanks.
Attachment:
pgpd3OLk1Ad9B.pgp
Description: PGP signature
