Eclipse Community Forums: EGit / JGit » Best way to deal with checkout/checkin issues with .classpath and .settings files

Home » Eclipse Projects » EGit / JGit » Best way to deal with checkout/checkin issues with .classpath and .settings files

Show: Today's Messages :: Show Polls :: Message Navigator

Best way to deal with checkout/checkin issues with .classpath and .settings files [message #1767622]

Fri, 07 July 2017 18:41

David M. Karr

Messages: 521
Registered: July 2009

Senior Member

I work on a largish multimodule Maven build project, using git for SCM. Quite a while ago, someone had pushed the .classpath and .settings/org.eclipse.jdt.core.prefs files to our repo. When he pushed them, they were specifying the use of JDK 1.5. Our code now requires JDK 1.8, and every time I check out this code, I get some annoying errors that I'm now used to. Each time I see this, I edit the project properties, unchecking the "Enable project specific settings" checkbox and replace the JRE 1.5 library with the default JRE 1.8 library.

I thought I would fix this by pushing the new versions of those files, but now when I try to pull the latest changes, I get checkout conflicts on those files, as I imagine Eclipse tries to modify them locally.

Is the proper fix to just remove these files from git and let m2e/eclipse set these files appropriately? Assuming that's true, what is the procedure in egit for removing and pushing files that I want Eclipse to recreate?

Report message to a moderator

Previous Topic:	Behavior divergence between Git and JGit on binary merge
Next Topic:	which git binary does EGit use

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Jul 11 23:39:27 GMT 2017

.:: Contact :: Home ::.