fatal: Exiting because of an unresolved conflict. 提示file1.txt有更新,确定替换为远程仓库的文件。这里用theirs. git checkout --theirs file1 ...
確定! 回上一頁