結果 : how to use command line to resolve conflicts in github