Git probably sees your .idea removal as exactly that; "Ah, he wants to remove all those files..."
There is always; git reset --hard which will remove all local changes and put the local copy into the latest HEAD that is committed. If you have local changes that you need to keep, then git checkout -b SomeNewBranch git commit -a -m "bla bla bla" git checkout master git pull origin master should do the trick. Cheers -- Niclas Hedhman, Software Developer http://www.qi4j.org - New Energy for Java I live here; http://tinyurl.com/2qq9er I work here; http://tinyurl.com/2ymelc I relax here; http://tinyurl.com/2cgsug _______________________________________________ qi4j-dev mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/qi4j-dev
