12.31.2013

Happy New Year.

Ally and I celebrated by going to Montrose for some Colorado Boy pizza and to see the Hobbit in the Fox Cinema’s Penthouse theater. Then I got pulled over for being a padidle. I swear, the headlight went out only 2 minutes earlier.

No Comments »
date Dec 31st 2013
author Mike
category Photo
tags(none)
 

12.30.2013

First day working remotely. For as much as I hate Skype, it’s an incredibly handy tool.

No Comments »
date Dec 30th 2013
author Mike
category Photo
tags(none)
 

12.29.2013

We watched Yentl and Elf today. Elf has better singing parts, but I probably only think so because it’s Zooey Deschanel singing and not Barbra Streisand.

Also, Ally straightened AJ’s hair, and I set up my command station in the sleep loft. I can foresee myself banging out some pretty badass code from here.

No Comments »
date Dec 29th 2013
author Mike
category Photo
tags,
 

12.28.2013

We live in Ridgway now. This is going to take a while to get used to.

A few things I learned:

  • I can’t pack my life into one box. It’s more like a dozen or so.
  • Ally is amazing, and is surprisingly good at rolling up a rug on her own.
  • Nicole has to be honest, even when playing Bullshit.
No Comments »
date Dec 28th 2013
author Mike
category Photo
tags,
 

Git Dev

1. Checkout master code from github.

cd into development directory, then run:

git checkout -b development origin/master

This simultaneously pulls down the master, and switches you into a development branch on local server.

2. Develop on local dev server, and track on remote development branch.

Make changes and updates. Repeat the following as much as needed:

git add .
git commit -m "commit message"
git push origin development:development

This will create a secondary parallel branch in github.

3. Merge development with master in github.

git checkout master
git merge --no-ff development
git branch -d development
git push origin master
git push origin :development
No Comments »
date Sep 14th 2013
author Mike
category Geek
tags