Subversion Client and Server Versions…
Just as a reminder for me and other Subversion Users out there:
Be careful with just upgrading your subversion client especially if you are using branches and do often some merges.
As of a new feature of Subversion 1.6 there is a new conflict type called Treeconflict.
Read here in Detail when you have to expect unresolvable conflicts if your subversion server is not 1.6 or higher…
