【Git及其冲突】Git commit与pull的前后顺序【记一次奇怪的历程】

先java git add . 再git git commit -m "本地第A次提交" 以后app git pull origin master 以后有冲突：gradle Auto-merging WheelPicker/build.gradle CONFLICT (content): Merge conflict in WheelPicker/build.gradle Auto-merging

>>阅读原文<<