Bill Roper (billroper) wrote,
Bill Roper
billroper

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
Subscribe

  • Time for Rebuilding

    Well, there's nothing like research. Having determined that DDR5 is going to carry a substantial price premium over DDR4 memory for at least a year…

  • Driven Wild

    The studio computer continues to misbehave in various ways. When I fired up Cubase today, I got a lot of nasty, blocky video, despite having cleaned…

  • Some Old Doggerel

    I recall having mangled a CSN tune many years ago on the way to Contraption. Like that convention, the particular co-worker whose code I was digging…

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    switch
    default userpic

    Your reply will be screened

    Your IP address will be recorded 

    Help
  • 2 comments