Git stuff
Conceptual description: http://www.sbf5.com/~cduan/technical/git/git-1.shtml
**HEAD is the name given to the commit from which the working tree’s current state was initialized.
git rebase allows you to pull changes from master into your development branch, but leave all of your development work “on top of” (later in the commit log) the stuff from master. When your new work is complete, the merge back to master is then very straightforward.
#Make a local copy of the git repo that you want to work on
git clone URL
make changes in local repository
git add changed.file
git commit -m “new changes”
git status
git push origin master
When you want to update your local copy with a special branch, do the following:
#Pull a fresh copy of develop
git checkout develop
#Look for last minute changes
git pull
#Check out the feature branch
git checkout feature/my_special_branch
#Merge with develop branch you just updated
git merge develop
**Switching to develop and doing a pull will ensure your local copy is up to date with the most recent develop branch. Then you add in the new feature branch by pulling it and then merging with develop.
