Setting up git and testing branch / merge process