Month: June 2018

SVN Basics – Module 5: Tagging and Branching

June 12, 2018
On to tags and branching then. Tags allow us to give a more human-friendly name to a specific revision of our folders/files. Branching gives us the capability to create a copy of the folders/files in our repository and have a different copy to work on - without fear of corrupting our main copy. As you've probably already grasped every time you commit a changed file to the repository SVN gives the repository a new, incremented by 1, revision number. In a reasonably sized project, over a year or two, it's not long before those revision numbers get into the thousands or even tens of thousands. So you're likely to get to the point where you have a stable set of...
Read more...

SVN Basics – Module 4: Managing Conflicts

June 4, 2018
We know how to create a repository. We know how to set up our SVN client and import our initial set of files. And in the 3rd module in this series, we saw how to check out and commit changes from/to the SVN repository. All pretty straightforward and easy to follow while just one user is working on one file. It won't be long though before you start getting warning messages from SVN that you have a conflict. It's how you should go about handling these conflicts we're looking at in this module.   What you'll find is that two people will be working on the same file and try to commit changes to the same file to the repository...
Read more...