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

  • Grouting Away

    The grout is going in. It turns out that there was not *enough* grout, because when you have tile in this style, it takes a *lot* of grout. So when…

  • Sealed Up

    The sealant went onto the stone sections of the backsplash tile today. That leaves the grouting and a good bit of touch up painting, after which the…

  • Very Close To Done

    The tile is now up in the kitchen. It still needs to be sealed and grouted, but it is nearly finished. Then I need to put up the various outlet…

  • 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