Git gives a clue to resolving conflicts in its error message. It says Merge conflict in [filename1], so you know there is a problem with that ...
確定! 回上一頁