git常见问题之git pull时Automatic merge failed; fix conflicts and then commit the result.
Administrator@PC-20151117FT04MINGW64/e/AsWorkspace/AndroidStudy(master)$gitpulloriginmaster--allow-unrelated-historiesFromgithub.com:nonfuxinyang/android-study *branch master ->FETCH_HEADAuto-m