Merging on the Ridiculous

Lots of ‘fun’ today merging two CVS branches. The merge itself wasn’t too bad, only about four files with conflicts. The pain came from the fact that the branch I was merging from wasn’t a complete piece of work. It was in a phase two of three state which meant that not all aspects were working. But the powers that be have decided they need the work done so far to be released into testing next week!
Ah well, got it all working in the end. Only another four merges to go!