Hi! I'm just struggling with some Subversion conflicts in net.sf.taverna.t2.taverna-workbench/plugins/provenanceconnectors-plugin - it seems that when we added this subproject we also committed these files and directories:
.classpath .project .settings/* target/* These are meta/configuration files and build directories typically made by Eclipse and Maven - and there's no point in checking them in as the m2eclipse plugin will manage to generate all of these. In fact that is the real problem - whenever something is updated these files will change locally - but if you then later commit these (by accident) it will force a conflict for all the other users. As these files are generated by Eclipse the only 'good' way to solve the conflict is to delete them and make Eclipse re-generate the files. To avoid this, the rule is to never commit these files in the first place, and to instead make sure that the svn:ignore for each project has: .classpath .project .settings target If the files ARE in the repository already - the way to fix it is to delete them on the command line with "svn rm" and "svn commit" - as Eclipse won't let you easily delete internal files. You are not able to svn-ignore files that are already committed in the UI (ignores only apply to files not already checked in) - so remember to delete the files first. As for provenanceconnectors-plugin I've fixed this now - but something to be aware of when you add a new project. -- Stian Soiland-Reyes, myGrid team School of Computer Science The University of Manchester ------------------------------------------------------------------------------ The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com _______________________________________________ taverna-hackers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/taverna-hackers Developers Guide: http://www.mygrid.org.uk/usermanual1.7/dev_guide.html FAQ: http://www.mygrid.org.uk/wiki/Mygrid/TavernaFaq
