結果 : how to merge two branches code in git