Team Collaboration using GitHub-BenB

gistfile1.md

Ben (Git Master)

• composer create-project laravel/laravel [project domain]
• ansible-playbook ansible/site-create.yml -e "domain=[project domain]" -l vagrant
• subl /etc/hosts
• Create Repo on GitHub
• git init
• git remote add origin [git url]
• git push -u origin master
• Grant Access to Teammates

Jason & Isaac (Teammates)

• git clone [git url] [project domain]
• ansible-playbook ansible/site-create.yml -e "domain=[project domain]" -l vagrant
• subl /etc/hosts
• composer install

Tools

• GitHub https://mac.github.com
• GitX http://gitx.frim.nl
• SourceTree http://www.sourcetreeapp.com

Git

• Copy a remote repo locally: git clone [url] [local name]
• Create your own branch: git branch [branch name]
• Switch branches: git checkout [branch name]
• Pull your changes from GitHub: git pull origin [branch name]
• Merge changes into master? Do that on GitHub
• Merge changes from master into your branch: git merge master
• Push your changes to GitHub: git push origin [branch name]