小程序解决git代码管理的no merge base found 问题

当遇到Git pull时报'nomergebasefound'错误,解决方案是先备份代码,然后在远程分支选择最新提交,使用HEAD重置到指定状态,确保不保留工作区内容,最后重新尝试pull操作。此方法适用于修复合并基找不到的问题。

摘要生成于 C知道 ,由 DeepSeek-R1 满血版支持, 前往体验 >

在进行以下操作前记得要先备份代码,以下操作会忽略本地工作区的内容。

代码在pull的时候报了“no merge base found”的错误

 在远程分支选择最新的提交,右键选择将HEAD重置到“XXXXX”

去掉勾选“保持工作区的内容 ”

重新pull 

PS D:\DAIMABIANXIE\Yolov5-master\yolov5-master (2)\yolov5-master\yolov5-master> python .\detect.py >> detect: weights=yolov5-master\runs\train\exp26\weights\best.pt, source=yolov5-master\VOCData\images\Nframe_1396.jpg, data=data\myvoc.yaml, imgsz=[640, 640], conf_thres=0.25, iou_thres=0.45, max_det=1000, device=, view_img=False, save_txt=False, save_csv=False, save_conf=False, save_crop=False, nosave=False, classes=None, agnostic_nms=False, augment=False, visualize=False, update=False, project=runs\detect, name=exp, exist_ok=False, line_thickness=3, hide_labels=False, hide_conf=False, half=False, dnn=False, vid_stride=1 requirements: Ultralytics requirements ['pillow>=10.3.0', 'requests>=2.32.0', 'setuptools>=65.5.1', 'wheel>=0.38.0'] not found, attempting AutoUpdate... ERROR: Exception: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 171, in _merge_into_criterion crit = self.state.criteria[name] KeyError: 'pillow' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 438, in _error_catcher yield File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 519, in read data = self._fp.read(amt) if not fp_closed else b"" File "C:\ProgramData\Anaconda3\lib\http\client.py", line 458, in read n = self.readinto(b) File "C:\ProgramData\Anaconda3\lib\http\client.py", line 502, in readinto n = self.fp.readinto(b) File "C:\ProgramData\Anaconda3\lib\socket.py", line 669, in readinto return self._sock.recv_into(b) File "C:\ProgramData\Anaconda3\lib\ssl.py", line 1241, in recv_into return self.read(nbytes, buffer) File "C:\ProgramData\Anaconda3\lib\ssl.py", line 1099, in read return self._sslobj.read(len, buffer) socket.timeout: The read operation timed out During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\base_command.py", line 189, in _main status = self.run(options, args) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\req_command.py", line 178, in wrapper return func(self, options, args) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\commands\install.py", line 316, in run requirement_set = resolver.resolve( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\resolver.py", line 121, in resolve self._result = resolver.resolve( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 453, in resolve state = resolution.resolve(requirements, max_rounds=max_rounds) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 318, in resolve name, crit = self._merge_into_criterion(r, parent=None) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 173, in _merge_into_criterion crit = Criterion.from_requirement(self._p, requirement, parent) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 82, in from_requirement if not cands: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\structs.py", line 124, in __bool__ return bool(self._sequence) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\found_candidates.py", line 143, in __bool__ return any(self) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\found_candidates.py", line 38, in _iter_built candidate = func() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\factory.py", line 167, in _make_candidate_from_link self._link_candidate_cache[link] = LinkCandidate( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 300, in __init__ super().__init__( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 144, in __init__ self.dist = self._prepare() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 226, in _prepare dist = self._prepare_distribution() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 311, in _prepare_distribution return self._factory.preparer.prepare_linked_requirement( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 457, in prepare_linked_requirement return self._prepare_linked_requirement(req, parallel_builds) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 480, in _prepare_linked_requirement local_file = unpack_url( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 230, in unpack_url file = get_http_url( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 108, in get_http_url from_path, content_type = download(link, temp_dir.path) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\network\download.py", line 163, in __call__ for chunk in chunks: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\progress_bars.py", line 159, in iter for x in it: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\network\utils.py", line 64, in response_chunks for chunk in response.raw.stream( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 576, in stream data = self.read(amt=amt, decode_content=decode_content) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 541, in read raise IncompleteRead(self._fp_bytes_read, self.length_remaining) File "C:\ProgramData\Anaconda3\lib\contextlib.py", line 131, in __exit__ self.gen.throw(type, value, traceback) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 443, in _error_catcher raise ReadTimeoutError(self._pool, None, "Read timed out.") pip._vendor.urllib3.exceptions.ReadTimeoutError: HTTPSConnectionPool(host='files.pythonhosted.org', port=443): Read timed out. WARNING Retry 1/2 failed: Command 'pip install --no-cache-dir "pillow>=10.3.0" "requests>=2.32.0" "setuptools>=65.5.1" "wheel>=0.38.0" ' returned non-zero exit status 2. ERROR: Exception: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 171, in _merge_into_criterion crit = self.state.criteria[name] KeyError: 'pillow' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 438, in _error_catcher yield File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 519, in read data = self._fp.read(amt) if not fp_closed else b"" File "C:\ProgramData\Anaconda3\lib\http\client.py", line 458, in read n = self.readinto(b) File "C:\ProgramData\Anaconda3\lib\http\client.py", line 502, in readinto n = self.fp.readinto(b) File "C:\ProgramData\Anaconda3\lib\socket.py", line 669, in readinto return self._sock.recv_into(b) File "C:\ProgramData\Anaconda3\lib\ssl.py", line 1241, in recv_into return self.read(nbytes, buffer) File "C:\ProgramData\Anaconda3\lib\ssl.py", line 1099, in read return self._sslobj.read(len, buffer) socket.timeout: The read operation timed out During handling of the above exception, another exception occurred: Traceback (most recent call last): File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\base_command.py", line 189, in _main status = self.run(options, args) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\req_command.py", line 178, in wrapper return func(self, options, args) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\commands\install.py", line 316, in run requirement_set = resolver.resolve( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\resolver.py", line 121, in resolve self._result = resolver.resolve( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 453, in resolve state = resolution.resolve(requirements, max_rounds=max_rounds) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 318, in resolve name, crit = self._merge_into_criterion(r, parent=None) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 173, in _merge_into_criterion crit = Criterion.from_requirement(self._p, requirement, parent) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\resolvers.py", line 82, in from_requirement if not cands: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\resolvelib\structs.py", line 124, in __bool__ return bool(self._sequence) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\found_candidates.py", line 143, in __bool__ return any(self) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\found_candidates.py", line 38, in _iter_built candidate = func() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\factory.py", line 167, in _make_candidate_from_link self._link_candidate_cache[link] = LinkCandidate( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 300, in __init__ super().__init__( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 144, in __init__ self.dist = self._prepare() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 226, in _prepare dist = self._prepare_distribution() File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\resolution\resolvelib\candidates.py", line 311, in _prepare_distribution return self._factory.preparer.prepare_linked_requirement( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 457, in prepare_linked_requirement return self._prepare_linked_requirement(req, parallel_builds) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 480, in _prepare_linked_requirement local_file = unpack_url( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 230, in unpack_url file = get_http_url( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\operations\prepare.py", line 108, in get_http_url from_path, content_type = download(link, temp_dir.path) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\network\download.py", line 163, in __call__ for chunk in chunks: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\cli\progress_bars.py", line 159, in iter for x in it: File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_internal\network\utils.py", line 64, in response_chunks for chunk in response.raw.stream( File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 576, in stream data = self.read(amt=amt, decode_content=decode_content) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 541, in read raise IncompleteRead(self._fp_bytes_read, self.length_remaining) File "C:\ProgramData\Anaconda3\lib\contextlib.py", line 131, in __exit__ self.gen.throw(type, value, traceback) File "C:\ProgramData\Anaconda3\lib\site-packages\pip\_vendor\urllib3\response.py", line 443, in _error_catcher raise ReadTimeoutError(self._pool, None, "Read timed out.") pip._vendor.urllib3.exceptions.ReadTimeoutError: HTTPSConnectionPool(host='files.pythonhosted.org', port=443): Read timed out. WARNING Retry 2/2 failed: Command 'pip install --no-cache-dir "pillow>=10.3.0" "requests>=2.32.0" "setuptools>=65.5.1" "wheel>=0.38.0" ' returned non-zero exit status 2. WARNING requirements: Command 'pip install --no-cache-dir "pillow>=10.3.0" "requests>=2.32.0" "setuptools>=65.5.1" "wheel>=0.38.0" ' returned non-zero exit status 2. Traceback (most recent call last): File ".\detect.py", line 446, in <module> main(opt) File ".\detect.py", line 441, in main run(**vars(opt)) File "C:\Users\19836\AppData\Roaming\Python\Python38\site-packages\torch\utils\_contextlib.py", line 116, in decorate_context return func(*args, **kwargs) TypeError: run() got an unexpected keyword argument 'iou_thres' PS D:\DAIMABIANXIE\Yolov5-master\yolov5-master (2)\yolov5-master\yolov5-master> 采用阿里元
最新发布
07-17
评论 2
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

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

抵扣说明:

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

余额充值