Rachel Ober
Life & Times of a Female Software Engineer
Life & Times of a Female Software Engineer
Jul 21st
My poor Isabella has been sick since Independence Day and I think all this hot weather is to blame. Adam and I decided to take an afternoon walk that Sunday and Izzie tagged along. Well, perhaps “tagged along” is the wrong phrase because it turned into us dragging her along the road in the heat as we made our way to the dairy farm up the road from my parents’ house with frequent stops in the shade of the few trees that spotted the road.
I really should have known better than to bring her outside. She’s notoriously bad in hot weather (who wouldn’t be in that much fur!), so much so that even on tame 70 degree days when we bring her to the dog park in White Plains, she’ll spend most of her time huddled by me under the cement bench in the shade.
I upgraded all my blogs to WordPress 3.0 today. Gotta say it was pretty painless since DreamHost has those One-click installs, and you know how lazy software engineers get…
Jul 7th
This is old news to some people, but on May 21, 2010 Adam asked me to marry him!
He surprised me with a day out at the Brooklyn Botanic Gardens for a photo walk (on one of the hottest days of the year that far) but ended up forgetting his camera’s battery. We made due with my puny point-and-click and enjoyed each others company.
After an afternoon of walking and enjoying the flowers, he brought me to the cherry blossom trees and we sat down. If you know Adam, you know he’s a bit of a procrastinator (like me!) We watched a group of people set up for what looked like a wedding and I could tell he was attempting to try and tell me something.
Unfortunately for him, his hesitation was too long and an security guard approached us and asked us to leave the area because the garden was closing (presumably for the event under the cherry blossoms!)
In the scurry of things, he first attempted to sit me down on one of the benches near the trees and as he began to talk a large Hesidic family was making its way across the grass towards us, yelling at their unruly children in the process. Adam rolled his eyes and tried for a third time to find a quiet and appropriate sitting place.
Finally, we walked around for a moment and sat me down on a bench as he stood and reached into his camera bag to pull out a ring box and presented me with my ring. Of course I said yes, we hugged and everything was happy. We then rushed off to the dinner he had scheduled that we were no doubt now late for.
He then surprised me once again when we showed up at the restaurant in New York City, we met up with his father, mother and sister and then shortly the rest of my family all the way from Pittsburgh and my sister from Philadelphia! “Mazel Tovs!” all around. We enjoyed a quiet but talkative evening celebrating our engagement and talked about tentative plans for a wedding next year.
Right now we are in the thick of planning a destination wedding for next summer in Aruba and hope to make a trip with our parents in the next month to scout some places out! We will also be having a reception in Pittsburgh and most likely its counterpart in New York City for our friends and family who won’t be able to join us for our tropical ceremony.
Apr 24th
My baby, Princess Isabella of Ascot, turns 2 today.
It’s hard to believe that we’ve been together for almost 2 years. Every day you look up to me to take care of you, feed you your favorite kibble, take you on long walks, and rub your belly and pat your head. There’s not much else you want from this world other than to feel loved and I’m here to give it!
Unfortunately, Izzie spent most of the day by herself because Adam and I had an engagement party to go to (or so we thought, we actually got the date wrong!) But when we got back, we fed her a special doggie version of a black and white cookie and her favorite treat, a tri-twisted bully stick.
She seemed to know it was a special day for her, every time she heard someone go by the apartment she would yell out, “It’s my birthday!” to anyone that would listen.
Apr 15th
This just saved my butt.
Say you want to delete a branch:
% git branch -D s-588-test-list-of-urls
BUT THEN YOUR REALIZE YOU DELETED THE WRONG ONE. And you had commits that were local and were not pushed to the main repository, this piece of information is very helpful.
Do a:
% git reflog
And you’ll get something like:
fbfdcea HEAD@{0}: checkout: moving from master to s-588-test-list-of-urls
fbfdcea HEAD@{1}: checkout: moving from b-702-slideshow-play-button-jquery to ma
c87935e HEAD@{2}: checkout: moving from s-588-test-list-of-urls to b-702-slidesh
eaeb971 HEAD@{3}: commit: Writing some looping code to pull urls from sitemap.xm
fe2d942 HEAD@{4}: commit: adding backgroundrb
fbfdcea HEAD@{5}: checkout: moving from master to s-588-test-list-of-urls
fbfdcea HEAD@{6}: checkout: moving from b-702-slideshow-play-button-jquery to ma
c87935e HEAD@{7}: commit: Change how the text buttons are colored
1d233b8 HEAD@{8}: checkout: moving from master to b-702-slideshow-play-button-jq
fbfdcea HEAD@{9}: checkout: moving from b-702-slideshow-play-button-jquery to ma
1d233b8 HEAD@{10}: commit: Slideshows work again with jQuery
f101f15 HEAD@{11}: checkout: moving from 0.8.0 to b-702-slideshow-play-button-jq
87a1769 HEAD@{12}: checkout: moving from b-702-slideshow-play-button-jquery to 0
f101f15 HEAD@{13}: commit: Playing with javascripts and styles
Pick out which revision you last remember you did on your branch and then do this (with a new branch):
% git checkout -b s-588-test-list-of-urls-redo HEAD@{3}
And then checkout the correct repository again:
% git checkout s-588-test-list-of-urls
And do a merge!
% git merge s-588-test-list-of-urls-redo
And breathe a sigh of relief because you saved yourself a panic attack.