Done yesterday (20101001 Fr)

[mdlbear]

1001 Fr
  & awake 5ish; snuggle
  * up 6:35; W=197.2; drugs, nose; coffee, dishes
  @ Your Dominant Intelligence is Linguistic Intelligence (not surprised)
  @ wonder_city | Simon Says: Murder Is Being Done via saffronrose
  * Got my merge done by cherrypicking. --ignore-ancestry would have been
    better if I'd known about it.  Git works much better.
  @ Climbing Mt. Normal - The We Got Your Back Project
  * bowl of chili from DD's for lunch, since it was after 1pm
  & call to Callie; went to voice mail.
  * El Torito for dinner with Colleen; medium drive afterward
  @ Rules for Anchorites - Twenty to One (on self-promotion and blogging)
  @ The We Got Your Back Project via kshandra
  & Swapping songs over the phone with N  Almost all her stuff
  * laundry; bed ~11, snuggle

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