git分支拉取时,提示冲突

stderr: error: unable to resolve reference refs/remotes/origin/xx/20231129: ??? 来自http://192.168.0.xx:6452/xxx-xx/xx-xx

! 新分支 hotfix/20231129 -> origin/xxx/20231129 (不能更新本地引用)

error: 一些本地引用不能被更新;尝试运行

'git remote prune http://192.168.0.xx:6452/xxx-xx/xx-xx.git' 来删除旧的、有冲突的分支

cpp 复制代码
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from http://192.168.0.xx:6452/xxx-xx/xx-xx.git
	at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:996)
	at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1237)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1297)
	at hudson.scm.SCM.checkout(SCM.java:505)
	at hudson.model.AbstractProject.checkout(AbstractProject.java:1206)
	at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:637)
	at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
	at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:509)
	at hudson.model.Run.execute(Run.java:1907)
	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
	at hudson.model.ResourceController.execute(ResourceController.java:97)
	at hudson.model.Executor.run(Executor.java:429)
Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress http://192.168.0.xx:6452/xx-xx/xx-xx.git +refs/heads/*:refs/remotes/origin/*" returned status code 1:
stdout: 
stderr: error: unable to resolve reference refs/remotes/origin/xxx/20231129: ????
来自 http://192.168.0.231:64280/paltform-web/organization-platform
 ! [新分支]          xxx/20231129 -> origin/xx/20231129  (不能更新本地引用)
error: 一些本地引用不能被更新;尝试运行
 'git remote prune http://192.168.0.xx:6452/xx-xx/xx-xx.git' 来删除旧的、有冲突的分支

	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2450)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2051)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$500(CliGitAPIImpl.java:84)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:573)
	at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:994)
	... 11 more
ERROR: Error fetching remote repo 'origin'
Finished: FAILURE

上面提示:

无法解析当前分支,同时还建议尝试运行 git remote prune 命令来删除旧的、有冲突的分支。

使用命令: git remote prune origin

cpp 复制代码
 git remote prune origin
修剪 origin
URL:http://192.168.0.xx:6452/xxx/xxx-xx.git
 * [已删除] origin/release/20230711
 * [已删除] origin/release/20230823
 * [已删除] origin/release/20230921
 * [已删除] origin/release/20230927
 * [已删除] origin/release/20231012
 * [已删除] origin/release/20231016
 * [已删除] origin/release/20231018
 * [已删除] origin/release/20231020
 * [已删除] origin/release/20231024
 * [已删除] origin/release/20231103
 * [已删除] origin/release/20231108
 * [已删除] origin/release/20231113
 * [已删除] origin/release/20231116
 * [已删除] origin/release/20231123

----------end

相关推荐
重生之我来学Python12 小时前
Git-SVN 混合开发,从入门到精通!
开发语言·git·svn·github
笨笨饿14 小时前
#137_死机恢复现场_Armino平台AP系统swd调试
git·python·stm32·单片机·嵌入式硬件·物联网·vim
King of fraud15 小时前
Git 入门:从零开始的版本控制之旅
git
AI大模型-小华15 小时前
Codex CLI第一次怎么用?从安装到读取本地项目完整教程
git·node.js·ai编程·开发工具·代码分析·codex·codex cli
2401_8616786215 小时前
Git 在 Windows 使用
windows·git·elasticsearch
青禾83718 小时前
Git 与 SVN 完全指南:从集中式到分布式的版本控制
分布式·git·svn
2301_8009549918 小时前
Git 版本控制核心概念详解:从集中式到分布式
分布式·git
Draw Stars1 天前
Git BASH安装教程
开发语言·git·bash
Akiyama_Mio-Kon1 天前
2026 最新:Dify 本地 Docker 部署完整教程(Windows + Git Bash)
windows·git·docker
福如意如我心意1 天前
Git Worktree开发指南
git