选中项目->右键->Git->Resolve Conflicts
http://blog.csdn.net/jaden_hool/article/details/51852196
版权声明:本文为xiyangyang8110原创文章,遵循 CC 4.0 BY-SA 版权协议,转载请附上原文出处链接和本声明。
选中项目->右键->Git->Resolve Conflicts
http://blog.csdn.net/jaden_hool/article/details/51852196