Hi, This is the first time i ever saw this during a source update
> cd /usr/src/ > git pull remote: Counting objects: 18, done. remote: Compressing objects: 100% (10/10), done. remote: Total 10 (delta 8), reused 0 (delta 0) Unpacking objects: 100% (10/10), done. >From git://git.dragonflybsd.org/dragonfly f4de6f9..8cb6454 DragonFly_RELEASE_2_6 -> origin/DragonFly_RELEASE_2_6 d575613..04db1b2 master -> origin/master Updating d575613..04db1b2 error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. > cd /usr/ > make src-update cd /usr/src && git pull Updating d575613..04db1b2 error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. *** Error code 1 Stop in /usr. > Current Versiob is 2.7-DEVELOPMENT DragonFly v2.7.3.44.gd5756-DEVELOPMENT #0: Wed May 19 07:37:57 IST 2010 Thanks --Siju
