Bill Roper (billroper) wrote,
Bill Roper

Merge With Care

I've nearly finished the particular Merge From Hell that I was working on at OVFF. I figured while checking this in -- which will probably take most of two days! -- I could test some other code that I've written.

Sadly, that branch of code is now contaminated with changes that someone else made, so I can't test it until I -- you guessed it! -- merge in all of his changes.

Thud, thud, thud.
Tags: musings, work

  • Ice, Ice, Baby

    Much of today could have been sold for scrap, but there was some progress on the refrigerator front. After decanting the contents of the fridge and…

  • One of Those Days

    Overall, it might have been better to stay in bed today, but that wasn't really an option. I am still slogging through a problem at work. I'm going…

  • Comcast At Work

    So we went to watch some TV that we'd recorded on our Comcast X1 DVR and discovered that -- overnight! -- we had gone from less than 50% full to over…

  • Post a new comment


    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded