git 文件冲突未跟踪

Submodule 'opencv' (https://github.com/opencv/opencv.git) registered for path 'opencv'
  error: The following untracked working tree files would be overwritten by checkout:
        3rdparty/carotene/.gitignore
        3rdparty/carotene/CMakeLists.txt
        3rdparty/carotene/README.md
        3rdparty/carotene/hal/CMakeLists.txt
        3rdparty/carotene/hal/dummy.cpp
        3rdparty/carotene/hal/tegra_hal.hpp
        3rdparty/carotene/include/carotene/definitions.hpp
        3rdparty/carotene/include/carotene/functions.hpp
        3rdparty/carotene/include/carotene/types.hpp
        3rdparty/carotene/src/absdiff.cpp
        3rdparty/carotene/src/accumulate.cpp
        3rdparty/carotene/src/add.cpp
        3rdparty/carotene/src/add_weighted.cpp
        3rdparty/carotene/src/bitwise.cpp
        3rdparty/carotene/src/blur.cpp
        3rdparty/carotene/src/canny.cpp
        3rdparty/carotene/src/channel_extract.cpp
        3rdparty/carotene/src/channels_combine.cpp
        3rdparty/carotene/src/cmp.cpp
        3rdparty/carotene/src/colorconvert.cpp
        3rdparty/carotene/src/common.cpp
        3rdparty/carotene/src/common.hpp
        3rdparty/carotene/src/convert.cpp
        3rdparty/carotene/src/convert_depth.cpp
        3rdparty/carotene/src/convert_scale.cpp
        3rdparty/carotene/src/convolution.cpp
        3rdparty/carotene/src/count_nonzero.cpp
        3rdparty/carotene/src/div.cpp
        3rdparty/carotene/src/dot_product.cpp
        3rdparty/carotene/src/dummy.cpp
        3rdparty/carotene/src/fast.cpp
        3rdparty/carotene/src/fill_minmaxloc.cpp
        3rdparty/carotene/src/flip.cpp
        3rdparty/carotene/src/gaussian_blur.cpp
        3rdparty/carotene/src/in_range.cpp
        3rdparty/carotene/src/integral.cpp
        3rdparty/carotene/src/intrinsics.hpp
        3rdparty/carotene/src/laplacian.cpp
        3rdparty/carotene/src/magnitude.cpp
        3rdparty/carotene/src/meanstddev.cpp
        3rdparty/carotene/src/median_filter.cpp
        3rdparty/carotene/src/min_max.cpp
        3rdparty/carotene/src/minmaxloc.cpp
        3rdparty/carotene/src/morph.cpp
        3rdparty/carotene/src/mul.cpp
        3rdparty/carotene/src/norm.cpp
        3rdparty/carotene/src/opticalflow.cpp
        3rdparty/carotene/src/phase.cpp
        3rdparty/carotene/src/pyramid.cpp
        3rdparty/carotene/src/reduce.cpp
        3rdparty/carotene/src/remap.cpp
        3rdparty/carotene/src/remap.hpp
        3rdparty/carotene/src/resize.cpp
        3rdparty/carotene/src/saturate_cast.hpp
        3rdparty/carotene/src/scharr.cpp
        3rdparty/carotene/src/separable_filter.cpp
        3rdparty/carotene/src/separable_filter.hpp
        3rdparty/carotene/src/sobel.cpp
        3rdparty/carotene/src/sub.cpp
        3rdparty/carotene/src/sum.cpp
        3rdparty/carotene/src/template_matching.cpp
        3rdparty/carotene/src/threshold.cpp
        3rdparty/carotene/src/vround_helper.hpp
        3rdparty/carotene/src/vtransform.hpp
        3rdparty/carotene/src/warp_affine.cpp
        3rdparty/carotene/src/warp_perspective.cpp
        3rdparty/fastcv/CMakeLists.txt
        3rdparty/fastcv/include/fastcv_hal_core.hpp
        3rdparty/fastcv/include/fastcv_hal_imgproc.hpp
        3rdparty/fastcv/include/fastcv_hal_utils.hpp
        3rdparty/fastcv/src/fastcv_hal_core.cpp
        3rdparty/fastcv/src/fastcv_hal_imgproc.cpp
        3rdparty/fastcv/src/fastcv_hal_utils.cpp
        3rdparty/hal_rvv/CMakeLists.txt
        3rdparty/hal_rvv/hal_rvv.hpp
        3rdparty/hal_rvv/hal_rvv_1p0/mean.hpp
        3rdparty/hal_rvv/hal_rvv_1p0/merge.hpp
        3rdparty/hal_rvv/version/hal_rvv_071.hpp
        3rdparty/ittnotify/include/llvm_jit_event_listener.hpp
        3rdparty/ittnotify/src/ittnotify/LICENSE.BSD
        3rdparty/ittnotify/src/ittnotify/LICENSE.GPL
        3rdparty/kleidicv/CMakeLists.txt
        3rdparty/kleidicv/kleidicv.cmake
        3rdparty/libjpeg-turbo/src/cjpeg.c
        3rdparty/libjpeg-turbo/src/cmyk.h
        3rdparty/libjpeg-turbo/src/djpeg.c
        3rdparty/libjpeg-turbo/src/example.c
        3rdparty/libjpeg-turbo/src/jversion.h.in
        3rdparty/libjpeg-turbo/src/libjpeg.map.in
        3rdparty/libjpeg-turbo/src/rdbmp.c
        3rdparty/libjpeg-turbo/src/rdcolmap.c
        3rdparty/libjpeg-turbo/src/rdgif.c
        3rdparty/libjpeg-turbo/src/rdjpgcom.c
        3rdparty/libjpeg-turbo/src/rdppm.c
        3rdparty/libjpeg-turbo/src/rdswitch.c
        3rdparty/libjpeg-turbo/src/rdtarga.c
        3rdparty/libjpeg-turbo/src/simd/CMakeLists.txt
        3rdparty/libjpeg-turbo/src/simd/arm/aarch32/jccolext-neon.c
        3rdparty/libjpeg-turbo/src/simd/arm/aarch32/jchuff-neon.c
        3rdparty/libjpeg-turbo/src/simd/arm/aarch32/jsimd.c
        3rdparty/libjpeg-turbo/src/simd/arm/aarch32/jsimd_neon.S
        3rdparty/libjpeg-turbo/src/simd/arm/aarch64/jccolext-neon.c
        3rdparty/libjpeg-turbo/src/simd/arm/aar
  Aborting
  Unable to checkout '31b0eeea0b44b370fd0712312df4214d4ae1b158' in submodule path 'opencv'
  git submodule update --init --recursive opencv exited with 1
  [bold magenta]full command[/]: [blue]git submodule update --init --recursive opencv[/]
  [bold magenta]cwd[/]: \[inherit]
  Traceback (most recent call last):
    File "/opt/python_3.8.2/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py", line 389, in <module>
      main()
    File "/opt/python_3.8.2/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py", line 373, in main
      json_out["return_val"] = hook(**hook_input["kwargs"])
    File "/opt/python_3.8.2/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py", line 143, in get_requires_for_build_wheel
      return hook(config_settings)
    File "/workspace/install_opencv/opencv-python/_build_backend/backend.py", line 12, in get_requires_for_build_wheel
      packages = _orig.get_requires_for_build_wheel(config_settings)
    File "/tmp/pip-build-env-8bvh3gpz/overlay/lib/python3.8/site-packages/setuptools/build_meta.py", line 162, in get_requires_for_build_wheel
      return self._get_build_requires(
    File "/tmp/pip-build-env-8bvh3gpz/overlay/lib/python3.8/site-packages/setuptools/build_meta.py", line 143, in _get_build_requires
      self.run_setup()
    File "/tmp/pip-build-env-8bvh3gpz/overlay/lib/python3.8/site-packages/setuptools/build_meta.py", line 158, in run_setup
      exec(compile(code, __file__, 'exec'), locals())
    File "setup.py", line 541, in <module>
      main()
    File "setup.py", line 68, in main
      g.run_command(
    File "/tmp/pip-build-env-8bvh3gpz/overlay/lib/python3.8/site-packages/pip/_internal/vcs/versioncontrol.py", line 631, in run_command
      return call_subprocess(
    File "/tmp/pip-build-env-8bvh3gpz/overlay/lib/python3.8/site-packages/pip/_internal/utils/subprocess.py", line 209, in call_subprocess
      raise error
  pip._internal.exceptions.InstallationSubprocessError: git submodule update --init --recursive opencv exited with 1
  error: subprocess-exited-with-error

  × Getting requirements to build wheel did not run successfully.
  │ exit code: 1
  ╰─> See above for output.

  note: This error originates from a subprocess, and is likely not a problem with pip.
  full command: /opt/python_3.8.2/bin/python3.8 /opt/python_3.8.2/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py get_requires_for_build_wheel /tmp/tmpmlo5n_s_
  cwd: /workspace/install_opencv/opencv-python
  Getting requirements to build wheel ... error
error: subprocess-exited-with-error

× Getting requirements to build wheel did not run successfully.
│ exit code: 1
╰─> See above for output.

note: This error originates from a subprocess, and is likely not a problem with pip.

错误原因
存在未跟踪(untracked)文件:这些文件是 Git 仓库中已存在的、但没有被添加到版本控制中的文件。
当 Git 尝试检出特定提交(commit)到子模块路径时,如果发现当前工作目录中有未跟踪的文件会与新检出的内容发生冲突,就会终止操作以防止数据丢失

解决方法:

cd opencv git clean -f -d # 删除未跟踪文件和目录 git reset # 取消暂存更改 cd .. git submodule update --init --recursive opencv

评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值