Auto Review 时报出文件有如下错误:
File Comment
.java file should not have carriage returns (DOS line endings)
解决办法:用编辑器打开文件,另存为时选择 保存(UNIX 换行符 - LF)。
Your change could not be merged due to a path conflict.Please merge (or rebase) the change locally and upload the resolution for review.
你的提交和服务器上的有冲突,要先把服务器上的文件同步,然后在上传。
解决办法
git fetch origin
git rebase origin/master 会提示冲突文件ÿ