#34 - Learning how to resolve conflicts within Subversion (SVN) using TortoiseSVN