結果 : how to check conflicts in git command line