stevenrouk/learning-git

Learning how to git, and github, and pull, and push, and merge, and branch.

#learning git

Let's learn how to branch, merge, push, pull, and all that fun stuff!

##SETUP (create git repo on our computer, push it to github)

git init
git remote add origin <github_url>
git commit -m "First commit."
git push -u origin master

##BRANCH (create development branch, push to github)

git checkout -b develop master
git push origin develop

##BRANCH (create new feature branch, push to github)

git checkout -b new_feature develop
git push origin new_feature

##MERGE (switch back to development branch, then merge in the new feature, delete feature branch, push to github)

git checkout develop
git merge --no-ff new_feature
git branch -d new_feature
git push origin develop

##MERGE (switch to master branch, merge in all new developments from the development branch, push to github)

git checkout master
git merge --no-ff develop
git push origin master

##RESOURCES These helped me out a lot!

A Successful Git Branching Model Versioning Git Branches The Git Book Stack Overflow: truly, the only reason I'm a successful coder.