Hippo, birdie, two ewes...

... to skydancer!!!! Have a great one!!

Done yesterday (20101001 Fr)

( raw notes )

A pretty good day.

I finally got my merge done by cherrypicking; svn merge --ignore-ancestry would have worked better if I'd read that section of the manual first. Git's merge mechanism is much saner -- it simply tracks what the files contain, rather than how they got that way. Grump.

There was one point, late in the morning, when I was dealing with the merge, an emergency hotfix in a different piece of code altogether, a coworker with a question, and got a call from Colleen. Overload. I got through it, but just barely. Do not like cubicles.

The YD was still gaming when I got home; Colleen and I went out to El Torito. Went for a bit of a drive afterward.

Foolish bear has been forgetting to re-enable (IM client) Pidgin when he restarts the computer. I did, finally, and connected with pocketnaomi in time for her to ask me to sing to her. We ended up swapping songs for quite a while, almost entirely her songs. Need to do that more often.

Anyway, I guess it was a good day on the whole, even if I didn't get a walk in.

Some good linke under the cut. My Dominant Intelligence is Linguistic. In other news, water is wet. (To be fair, a couple of different close choices could probably have tipped it into mathematical or maybe even musical.)