On Wed, Jan 28, 2009 at 10:29:18PM +0530, Himanshu Chauhan wrote: > Hi, > > I am updating my tree with git-pull. > But I am getting this error. > > scripts/package/Makefile: needs update > error: Entry 'scripts/package/Makefile' not uptodate. Cannot merge. > > How can I fix this? You have local changes to scripts/package/Makefile $ git status $ git diff And then, if you're satisfied, do: $ git commit scripts/package/Makefile Or clear your changes: $ git checkout scripts/package/Makefile Then git pull should work (don't use the dash form (git-pull) from now on, it's been deprecated for some time, and removed in recent git). -- Luciano Rocha <luciano@xxxxxxxxxxx> Eurotux Informática, S.A. <http://www.eurotux.com/>
Attachment:
pgppQa4dm4Icf.pgp
Description: PGP signature
