Ben Lobaugh Online

I think, therefore I am. I am, therefore I sail

Category: Uncategorized Page 1 of 6

Alix first ever paint stroke

First strokes

Alix first ever paint stroke

How many Bens can you find?

This is what community means

I like being a part of a community.

I like being around people with the same passions and joys as me.

I like people who come together for the common good.

Shilshole Bay Yacht Club (SBYC) is a great example of a fantastic community. Ever since my first event I was hooked by the quality of people and their community. Both on and off the water I have found SBYC members to be warm and caring.

Recently I needed to mow my lawn. My lawn was not your typical overgrown lawn. Due to my property holding water I was not able to walk across the lawn without sinking at least an inch. By the time we had enough warm dry days in a row to make the lawn safe to walk on the lawn had become a jungle. I could barely see my dogs when they went outside!

Unfortunately my mower was not up to the job, and the weed whacker would have taken all day. SBYC member Anne to the rescue! Anne lives lives nearby and when I asked if she had a lawn mower I could borrow she agreed without a seconds hesitation or questions.

Using Anne’s beefy lawn mower allowed me to trim back the jungle in a couple hours, instead of days. I even had to make two passes with the first on the highest setting.

Thank you Anne for being a part of the SBYC community, and thank you SBYC for creating and promoting a wonderful community!

IMG_2817

Replace one git branch with the contents of another

At WebDevStudios we use branches as deployment channels in Beanstalk. Today I ran across a situation where one of the dev branches had significantly diverged from the production branch. difftool showed 988 differing files. Needless to say this caused some issues on the dev server.

I needed to sync the dev branch with the production branch by replacing everything in the dev branch. Here is how I did it:

All at once

git checkout prod
git checkout -b new-dev
git merge -s ours dev
git checkout dev
git merge new-dev
git push dev

Breakdown

git checkout prod
git checkout -b new-dev

Create a new branch off of the production branch that can merges can be tested in.

git merge -s ours dev

using -s ours will essentially overwrite everything from dev with changes in new-dev (prod originally). If this switch is not used a lot of conflicts would have been introduced and I do not have enough scotch on hand to stop that headache.

git checkout dev
git merge new-dev
gitpush dev

It is now safe to merge new-dev into dev. There should not be any conflicts. Push it out and the dev branch is now sync’d back with prod.

  

Macaw

Page 1 of 6

Powered by WordPress & Drip City Coffee