Resolving Subservsion Tree Conflicts when Merging
May 13th
When merging changes in a Subversion project, you’ll need to resolve any conflicts between your checked out version and the one that you are about to merge from the server. Commonly, conflicts arise when two or more developers have modified the same file; these can be resolved by accepting either parties changes or by completing [...]
Ignoring Files and Directories in a Subversion Project
Dec 1st
Configuring Subversion to ignore files can sometimes cause confusion. Like most things though, if you understand the basic principles, then its not tricky at all. In this post I’ll demonstrate just how you should go about ignoring files in a subversion project.
A Unix Command to Recursively Delete all .svn Folders
Nov 25th
I recently needed to check out a project from Subversion and then delete all of the .svn files from the project directories. Google found me a few different ways to do this, but none of them seemed to deal with a case where some of the directory and file names had spaces or quotes in them – as mine did. After a little experimenting, I figured out how some simple Unix commands that could be combined using pipes to do this.
Branching and Merging with Subversion (SVN)
Nov 1st
Working in the head revision of a versioning system isn’t a great idea. It’s much better to work in a branch and to merge the changes once you’re convinced they are stable. This post demonstrates how to do this with Subversion.
