結果 : how to merge code in git command line