Archives for Stefan Saasen

Moving Confluence from Subversion to git

Three months ago, the Confluence team switched from Subversion to git, just in time for our 4.1 release. In Confluence, git, rename, merge oh my… we talked about the problems we encountered with merges across branches that had lots of renames. In this post, we take a step back to look at the tools we used in order to migrate the Confluence source code from Subversion to git. Preparation Firstly, we wanted to ensure that the following infrastructure supported our source code hosted in git: Since

Continue reading »

Tags: , , , , ,
Comments (21)

Confluence, git, rename, merge oh my…

Confluence moved from Subversion to git 3 weeks ago and we were finally in a good position to merge a fairly significant reorganisation of our source code into master. Maven artifact and directory names now match and it is possible to rebuild Confluence without having to rebuild the world. Our architect Charles had this in the pipeline for a while but decided to wait until after we moved, as SVN isn't known to handle situations like this very well: The moral of this story is that until

Continue reading »

Tags: ,
Comments (0)