Subversion

More on svn and how to manage your repository (especially in case of conflicts), see

http://svnbook.red-bean.com/nightly/en/svn.tour.html#svn.tour.help