[LinuxPPS] fatal: Entry '.gitignore' not uptodate. Cannot merge.

[Rodolfo Giometti]

On Mon, Apr 30, 2007 at 09:31:03PM -0500, Thomas Kayser wrote:
> I'm having problems with the git repo:
> 
> debian:/home/tom/linuxpps# git pull git://git.enneenne.com/linuxpps
> 
> or possibly git itself.  When I do a:
> 
> debian:/home/tom/linuxpps# git pull git://git.enneenne.com/linuxpps
> 
> I get:
> 
> fatal: Entry '.gitignore' not uptodate. Cannot merge.

Try this:

$ rm .gitignore
$ git-checkout-index .gitignore

Then retry the pull.

> I have to download the repo everytime I want to update the linuxpps patch.

No. Git will just download the differences.

Ciao,

Rodolfo

-- 

GNU/Linux Solutions                  e-mail:    giometti at enneenne.com
Linux Device Driver                             giometti at gnudd.com
Embedded Systems                     		giometti at linux.it
UNIX programming                     phone:     +39 349 2432127