How To Use Git To Merge With The Master