Git workflow for group project

group_git.md

Git workflow

SETUP

git clone <repo>
git checkout <your name -feature>

Periodically

git fetch
git checkout master
git pull                    ;update your master 
git checkout <feature-branch>    ;prepare for merge
git merge master               ;conflicts can happen now

Done

git push origin <branch>

create a pull request on github on the pull request youcan merge into master on github

Starting a new Feature

git fetch
git checkout master
git pull
git checkout -b <branch name>