more on git, and github

properly trying to merge a branch - 

ex: I'm currently working on a bracnch called testing. 
  1. git status
  2. git add file 
  3. git commit -m "throw in a nice message"
  4. git push origin testing. 

git checkout (whatever branch) 

ex: git checkout master 
  1. git merge testing - this merges testing, and the code, and or changes just commited to the branch master. 
  2. git status 
  3. git push origin master.