scgit管理代码 .java file should not have carriage returns (DOS line endings)；Please merge (or rebase) th

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     会提示冲突文件，并手动修改

git add .

git rebase --continue

git push origin HEAD:refs/for/master

git process crashed：

If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.

解决方法：

rm -f ./.git/index.lock

git合并两个commit到一个

$ git reset --soft HEAD^1

$ git commit --amend

git 修改commiter信息

 git commit --amend --author="JerryKwan <JerryKwan@gmail.com>"