problems fixed

05/13

problem:

at chromium/chromium-android/src , executed command ' git pull --rebase origin master'

prompt message:　　 It looks like git-am is in progress. Cannot rebase.

solution: 　　rm -rf .git/rebase-apply

转载于:https://www.cnblogs.com/hanying/p/3724886.html