git pull
Updating 5f7177f..6bebc15
error: Updating the following directories would lose untracked files in it:
3rdparty/opencv-3.0.0
error: The following untracked working tree files would be overwritten by merge:
files/models/enroll_model_V1.svm
files/models/enroll_model_V2.svm
opencv-bridge/lense.cpp
opencv-bridge/lense.h
opencv-bridge/opencv-bridge.pro
opencv-bridge/opencvbridge-sharedlib.h
opencv-bridge/opencvbridge.cpp
opencv-bridge/opencvbridge.h
src/pb_pvs_common.h
src/pb_pvs_math_svm.h
util/scan-info-sort/main.cpp
util/scan-info-sort/scan-info-sort.pro
Please move or remove them before you can merge.
Aborting
прочитай внимательно
Обсуждают сегодня