READ THIS.

Updated .gitignore with a common C# pattern.

I spoke with an expert sourcetree user. Every time you want to pull, first commit all your changes, then right click the new stuff you want to pull and click "rebase"
After you rebase you may pull.

If you do this, we are less likely to run into errors and we also avoid the ugly branches which makes life harder.