A common cause for headaches when dealing with version control is the process of merging a branch of code back into the trunk. As a brief primer, software developers will use version control systems ...

So I have inherited management of a Subversion server that hold the source code for my employer. I have a windows admin background for the record. I'm have some trouble making headway with this thing ...