On Thu, May 20, 2010 at 5:11 PM, Stathis Kamperis <ekamp...@gmail.com> wrote: > Just like git says, you have a modified version of the file > 'lib/libc/uuid/uuid_name_lookup.c'. >
I wonder how that happened :-( All I modified was GENERIC.MP which is a copy of GENERIC config file with SMP and APIC stuff uncommented. > When you do a 'git pull', you tell git to fetch remote changes and > merge them with your local tree. If git does so, the remote copy will > overwrite your local copy of the file we discuss. Here git tries to > protect you from losing any work you've done on the file, by stopping > the merge. > Oh thanks for the explanation :-) > Also, make sure that you are on the right branch when you 'git pull'. > > This should fixed it. If not, feel free to write back :) > Yes it is fixed :-) Thanks a lot --Siju
