Please use Git Flow with the exception of the Release branch (not needed for us). This page is very specific as what to do and when.
Add the following to ~/.gitconfig
. This is required for these commands below and to make sure we are consistent in helping each other out.
[color]
ui = auto
[color "branch"]