git冲突的场景与其他SCM工具一样,我在这边修改了文件a,同事也修改了文件a。同事比我先提交到仓库中,那么我pull代码时就会报错:$ git pull
remote: Counting objects:39, done.
remote: Compressing objects:100% (30/30), done.
remote: Total39(delta13), reused0(delta0)
Unpacking objects:100% (39/39), done.
Fromhttps://code.csdn.net/lincyang/androidwidgetdemo
d3b2814..5578b8c master -> origin/master
Updating d3b2814..5578b8c
error: Yourlocalchangestothefollowingfileswould be overwrittenbymerge:
app/src/main/AndroidManifest.xml
app/src/main/java/com/linc/skill/screenswitch/ScreenSwichActivity.java
Please, commit your changesorstash thembefore
...
继续阅读
(36)