liubingbingdeiMac:lbbVideo lbbniu$ git pull
Updating 93d85f8..e260b6c
error: The following untracked working tree files would be overwritten by merge:
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.pbxproj
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.xcworkspace/xcuserdata/lbbniu.xcuserdatad/UserInterfaceState.xcuserstate
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.xcworkspace/xcuserdata/lsl.xcuserdatad/UserInterfaceState.xcuserstate
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.xcworkspace/xcuserdata/vliang.xcuserdatad/UserInterfaceState.xcuserstate
ios/lbbVideoStatic/lbbVideo.xcodeproj/project.xcworkspace/xcuserdata/zhangys.xcuserdatad/UserInterfaceState.xcuserstate
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/lbbniu.xcuserdatad/xcschemes/lbbVideo.xcscheme
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/lbbniu.xcuserdatad/xcschemes/xcschememanagement.plist
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/lsl.xcuserdatad/xcschemes/lbbVideo.xcscheme
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/lsl.xcuserdatad/xcschemes/xcschememanagement.plist
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/vliang.xcuserdatad/xcschemes/lbbVideo.xcscheme
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/vliang.xcuserdatad/xcschemes/xcschememanagement.plist
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/zhangys.xcuserdatad/xcschemes/lbbVideo.xcscheme
ios/lbbVideoStatic/lbbVideo.xcodeproj/xcuserdata/zhangys.xcuserdatad/xcschemes/xcschememanagement.plist
ios/lbbVideoStatic/lbbVideo/DWMediaSubtitle.h
ios/lbbVideoStatic/lbbVideo/DWMediaSubtitle.m
ios/lbbVideoStatic/lbbVideo/DWPlayerMenuView.h
ios/lbbVideoStatic/lbbVideo/DWPlayerMenuView.m
ios/lbbVideoStatic/lbbVideo/DWTableView.h
ios/lbbVideoStatic/lbbVideo/DWTableView.m
ios/lbbVideoStatic/lbbVideo/DWTools.h
ios/lbbVideoStatic/lbbVideo/DWTools.m
ios/lbbVideoStatic/lbbVideo/NSDictionaryUtils.h
ios/lbbVideoStatic/lbbVideo/UZAppDelegate.h
ios/lbbVideoStatic/lbbVideo/UZAppUtils.h
ios/lbbVideoStatic/lbbVideo/UZModule.h
ios/lbbVideoStatic/lbbVideoTests/Info.plist
Please move or remove them before you can merge.
Aborting

git clean  -d  -fx ""

其中 

x  -----删除忽略文件已经对git来说不识别的文件

d  -----删除未被添加到git的路径中的文件

f  -----强制运行

转载请注明：爱学习爱分享 » git冲突Please move or remove them before you can merge