I build on Windows and it's fine most of the time. I didn't deal with (1) and (2) as my initial clone was OK; I avoid (3) with - Dmaven.test.skip=true
But sometimes I get these errors even though I don't change any files. I work around this by deleting the files and repeating the pull. I don't know if that's a good practice but I get the update. >git pull ... Updating 2938997..db3466e error: Entry 'src/jvm/clojure/lang/APersistentMap.java' not uptodate. Cannot merge. Updating 2938997..db3466e error: Entry 'src/jvm/clojure/lang/ASeq.java' not uptodate. Cannot merge. -- You received this message because you are subscribed to the Google Groups "Clojure" group. To post to this group, send email to clojure@googlegroups.com Note that posts from new members are moderated - please be patient with your first post. To unsubscribe from this group, send email to clojure+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/clojure?hl=en
