結果 : git use command line to resolve conflicts