As we are working with many instances of the software being in different code branches and releases is there a way to keep the Confluence documentation versioning in pace with this?
(In the past I used Subversion in combination with MS folders and Office documents. That worked perfectly well except the merging was cumbersome. Something I expect to be a bit easier with Confluence.)