Ok, moving .idea dir away worked. Still, why do I need to move it away? I suspect my idea project now is all messed up ... will go check .... yep. It does not open anymore :-(
Should not all of .idea dir be specified in .gitignore? One could always import from pom.xml. On Thu, Sep 24, 2009 at 7:41 AM, Alex Shneyderman <[email protected]> wrote: > Hi, guys! > > I was trying to get up-to-date on sources. I do the following: > > a...@tompicsek:~/projects/java/qi4j/qi4j-core$ git pull origin master > Updating 074d7a0..831b905 > .idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml: needs update > .idea/libraries/Maven__junit_junit_4_4.xml: needs update > .idea/libraries/Maven__org_apache_felix_org_osgi_core_1_2_0.xml: needs update > .idea/libraries/Maven__org_easymock_easymock_2_3.xml: needs update > .idea/libraries/Maven__org_ops4j_base_ops4j_base_lang_0_5_0.xml: needs update > .idea/libraries/Maven__org_ops4j_pax_swissbox_pax_swissbox_core_0_2_0.xml: > needs update > .idea/libraries/Maven__org_ops4j_pax_swissbox_pax_swissbox_extender_0_2_0.xml: > needs update > .idea/libraries/Maven__org_ops4j_pax_swissbox_pax_swissbox_lifecycle_0_2_0.xml: > needs update > .idea/libraries/Maven__org_ops4j_pax_swissbox_pax_swissbox_optional_jcl_0_2_0.xml: > needs update > api/src/main/java/org/qi4j/api/entity/IdentityGenerator.java: needs update > fatal: Entry '.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml' not > uptodate. Cannot merge. > > So, something is really screwy here. Anyone knows what's wrong? > > As you could guess I am no git master so any clues as to what's wrong > are appreciated. > > Thanks, > Alex. > _______________________________________________ qi4j-dev mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/qi4j-dev
