Bill Roper (billroper) wrote,
Bill Roper
billroper

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...

*sigh*
Tags: musings, work
Subscribe

  • I'm Going Back To Work, I'm Going Back To Work

    I spent more time today working over designs than coding, but that's ok. Getting the design right makes the coding easier. And more likely to work...

  • Swept

    The weather was relatively cool today, so Gretchen and I went out and spent some time trying to get the garage into a state where it could be cleaned…

  • Everybody's Got a Recipe For Dumplings

    These things happen in our household. Gretchen and I were driving home from lunch and listening to Radio Margaritaville when our discussion turned…

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 1 comment