Little poppy is fast and furious these days (at least when she doesn’t get what she wants, fast enough). Turn your back and she’s gone…. or perhaps she’s up, as in climbing up furniture. She’s eating a lot (sauteed mushrooms and onions and swash and garlic, last night… mmmm) and still has chubby legs and a belly on her, but for the most part has lengthened out and looks more and more like a kid and less and less like a baby.
Poppy has long been termed as a “rough neck” and she certainly earns that title, loving to be thrown around and tickled and rough housing with her peers or adults alike.
She has just started spinning around in circles to get herself dizzy. It’s one of the cutest things I’ve ever witnessed.
The downside is that she already staggers like a drunk anytime she’s tired and sometimes when she’s not… so this just adds to the appearance that she is seconds away from being face-down on the ground.
So I’ve just fought a battle w/ SVN merge and thought I’d post the solution in case others might find it…
Scenario
Our stable code is in trunk svn://svn.domain.tld/repository/trunk
I’ve got a branch of trunk svn://svn.domain.tld/repository/branches/dev
Changes have been made to my branch and changes have been made to trunk, since I branched.
I’m ready to merge my branch back into trunk.
Approach / Overview
Basically, to be safe, I need to first update my branch with the changes from trunk and resolve any conflicts.
Mom and Sam drove to Louisville for a few days this past weekend+ (Friday – Tuesday).
We all had a wonderful visit and they played with poppy almost nonstop… as expected. We took full advantage of the free babysitting and went out a few nights and on the whole, were less than adequate hosts, but they didn’t seem to mind.
Mom’s posted her photos here, and below is a slideshow
Poppy is:
walking well, though she still staggers like she’s drunk when she’s tired. sometimes eating vegetables, often not – but always eating fruit and crackers are much better starting to learn a few signs… she’s known “more” for a while now, but now she can do eat and drink and occasionally a few others. certainly understands many words and phrases and tones of voice, and is starting to mimic more often… sometimes putting a word in context a bit… though it’s a stretch and only her family would recognize these accomplishments.