git - workflow e merge