Back in 2005, we decided to use Sub­ver­sion scm for the source code man­age­ment in the Carpe Noctem pro­ject. This decision sur­vived the last four years but based on what we exper­i­enced dur­ing this time – we even man­aged to some­how blown up our repos­it­or­ies –, the team decided to switch over to git after the World Cham­pi­on­ships 2009. We’ll have to see how things work out now and if people man­age to come to grips with the new system.

Today, I tried to merge some changes for the new Spica ver­sion. As I main­tained a sep­ar­ate repos­it­ory for this pur­pose, I wasn’t sure about how well git merges these data. Sur­pris­ingly, it went just smooth. Only about eight simply con­flicts needed to be solved. This res­ul­ted in my first lightly more com­plex git tree. Looks inter­est­ing in gitk :)

git his­tory