Version Control Software

Subversion (SVN)

Basic procedure:

If you get a conflict (in NetBeans), don't just edit the file by hand, click on team; resolve conflicts and a nice merge editor will be displayed.

An advantage of Eclipse over Netbeans is that "Subclipse" supports display of the last person who committed a file.

Eclipse (Subclipse) conflict resolution: