Git Workflow

Syncing up with our remote origin/master on Github

1) Checkout to your local master

git checkout master

2) Fetch the latest branches from origin/master on our Github repo

git fetch origin

3) Rebase the latest commits on origin/master remote branch

git rebase origin/master

Working on your local branches

1) Checkout out into a local working branch

git checkout -b this_is_my_working_branch

2) Work on your code. Once satisfied, commit the changes and rebase into local master branch

git commit -m "[#XXX] This is the latest commit"

git checkout master

git rebase this_is_my_working_branch

3) Fetch and rebase the latest from the origin/master

git fetch origin

git rebase origin/master

4) Git push local master into origin/master

git push origin master