Monday, May 2, 2011

Happy merge day is here!

Parallel projects with the same customer, on the same technical platform, demand quite a lot of the source code system. At Nansen we use Microsoft Team Foundation Server, which has been serving us well over the years. A couple of months of separately developed functionality required some serious branching, which has now come to an end. This merge event, referred to as "Happy merge day", has just started at the Stockholm Office. And so far so good, the hilarious fellas in Team Burton, Robert and Tomas report. All code builds, now, up for customer testing, to avoid potential mismatching business logic.

"Happy Merge Smurf" and "Merge hell Gargamel" in action!