Bill Roper (billroper) wrote,
Bill Roper

Up the Lazy River

The problem when you have long-lived branches in Git (or, I presume, pretty much any version control system) is that you need to keep them updated so that the source code there vaguely resembles what's on the main line. When there's any substantial velocity on the main line, it's worse.

It's worse.

I have two different branches that I've had to do major projects on that I haven't been allowed to merge back to the main line. One of them I hadn't done any work on since early November, which was the last time that I updated it from the main line.

Today's merge took well over an hour as I tried to reconcile the changes and it *still* won't compile correctly.

And now I have an email that says that the *other* branch needs to be updated.

Which is why I keep saying that we need to merge these things.

(We have one branch that is over a year old, because the work I did there hasn't been merged yet. Eek!)
Tags: coding, musings, work

  • Well, That Escalated Quickly

    Today could have been better. Much better.

  • The More You Know

    The problem with getting older is that -- although you may know more than you did when you were younger -- it seems like there are more and more…

  • Paying It Off

    I checked tonight and I do indeed have two more months to pay my property tax without incurring late fees. So I guess I'll be paying that later. The…

  • Post a new comment


    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded