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!)
