[GIT] Conflicting files .classpath

When we pull the project from upstream it says conflicting files: .classpath

Why does it do that?

I’m using eclipse and github. I don’t really know what else to explain because I don’t really know how to use git so.

That should probably be in your gitignore. Look it up if you don’t know what that is.

I went to the .gitignore and added in the line .classpath, it fixed it but now when running it, it says “Can’t find main class”

eclipse: [icode]Right-click on your class, run as -> Java Application/Java Applet[/icode]

console: [icode]java helloWorld.class[/icode]