dotfiles

Dotfiles

Everybody else is doing it.

I'm actually using the Wiki on this one:

• https://github.com/ereckers/dotfiles/wiki

EXPERIMENTS

This is what we're going to do:

1. create feature branch
2. make 2 edits to feature branch
3. checkout master branch
4. make 1 edit to master branch
5. checkout feature branch and make 1 edit
6. trying the merge w/ squash commit

THESE are my master changes:

1. add line 1 in master

EDITS START

1. add line 1 in branch
2. add line 2 in branch
3. add line 3 in branch