Beginning of feature-dev branch behavior
Adding more features
Merged master into feature

As a result, feature ABC is also now in the feature-xyz branch. So our
feature branch includes all of master's code.
Fixed typo

Figure out how to rebase/smash this into the next commit.
Post-typo repair code

How to rebase  this and the typo fix?
Merge remote-tracking branch 'origin/master' into feature-xyz
Even more work being done on XYZ
added comment to bottom of .gitignore
Merge branch 'feature-xyz' of https://github.com/desertrambler/branch-merge-demo into feature-xyz
Added more code to Feature X
Added Feature Y code
.gitignore is updated again?
Merge remote-tracking branch 'origin/feature-xyz' into feature-xyz
Why no rebasing?
Merge remote-tracking branch 'origin/master' into feature-xyz