This is just a collection of the notes I have jotted down for myself as I learned how to use Git. I have tried
to make sure they are valid, and that the language is understandable, though not necessarily proper 'Git Speak'. I don't
think anything is catastrophically wrong, but please don't rely on them for a production machine, or anything you
haven't got backed up.

If something really bad happens, feel free to visit my Feedback page and
give me a piece of your mind. I won't promise I'll know what happened, I am a newbie myself, but I'll at least
grieve with you.

For any of you Git gurus out there, I hope you'll let me know if I'm doing bad things. Any help is appreciated.

You now have a second version, or 'timeline' of the repo directory that is active when you have it checked out. At
this point the new_branch and the master branch are identical. Any changes to either splits the repo into two
separate versions of the entire repo that diverge at the point any changes are made.

Any changes made while a branch is checked out are only visible when that branch is checked out. To synchronize
changes between branches, you need to merge. (step 6)

When binary files conflict, you can't fire up vim to edit them, so you need to decide if you
want your local copy or the remote copy. You can use git checkout to copy
the remote file into your local repo and replace your local version.

The first time I deleted files in a development branch, I just about had a heart attack! I committed my changes,
and then checked out the master branch. That action was met by Git listing all the deleted files. When I looked around
in the master branch, all the files deleted in the development branch were also gone! Ahhhhh!

Turns out that when you add all files with git add . it actually doesn't touch the deleted files. Do a
git status after committing and you will see that the deleted files still listed.

I guess because not all the files were committed, git didn't change the working directory to master when I checked it out.
Causing a small bump in my blood pressure.

To really commit deleted files you do one of two things:

Instead of deleting them like you normally would, have git delete them for you. This also allows you to commit the deletion.

git rm <filename>

Add them to the commit with the "-A" switch. This will add all of the deleted files to the next commit.