search

prmr / Creco

Recommendation System for Consumer Products
Apache License 2.0
6 stars 2 forks source link

Local files included in master branch #92

Closed enewe101 closed 10 years ago

enewe101 commented 10 years ago

When @prmr pulled today we saw that an error was introduced in a recent commit because of the fact that I had included some bad versions of the .classpath, .project, and .settings/... files.

I found the commit where that happened and reverted these files to the versions that were in the repo before that commit -- could someone pull from master and let me know if this was resolved?

enewe101 commented 10 years ago

Looking at the master log, I've noticed that people's commits contain .classpath lately.

This might be because everyone is getting conflicts in the .classpath file, and then committing the resolution.

I know this was your experience, @prmr, based on your commit message in c0fbdd0148f4569.

Hopefully this will die away having reverted the files. Maybe post here if you are getting conflicts, so we can get some visibility.

prmr commented 10 years ago

This is a good time to remind everyone to carefully look over your commits. If they contain changes to settings files, you should remove them from the commit and reset them (if there's no real change), not commit them.

enewe101 commented 10 years ago

This issue seems to be resolved!