Bill Roper (billroper) wrote,
Bill Roper

Because a ClearCase Merge Is So Much Fun...

I made a moderately invasive change to the mainline code for our next release that cleans up a potential locking problem. And since the word "locking" was in the vicinity, I decided that I should merge this to my similar locking line with the changes I spent the last year working on.

Two days later, the merge almost compiles. I have one last fix to make...

Tags: musings, work

  • Design on the Fly

    The great thing about us and getting this kitchen done is that we are able to design on the fly. Our contractor came by, looked quickly at the…

  • Time to Rearrange

    I expect to hear back from the contractor on Monday and we'll discuss exactly how to fix things up in the kitchen. I don't think any of this will be…

  • Closer To Fine

    So the cabinets went in today, which is good. There are, sadly, two problems. First, there is a measurement glitch which resulted in the cabinets…

  • Post a new comment


    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 1 comment