git分支拉取时，提示冲突

oToyix

已于 2023-11-29 09:55:18 修改

阅读量840

点赞数 9

分类专栏： Git && SVN linux常用基础技能及服务文章标签： git

于 2023-11-29 09:51:29 首次发布

本文链接：https://blog.csdn.net/oToyix/article/details/134682594

版权

linux常用基础技能及服务同时被 2 个专栏收录

76 篇文章 1 订阅

订阅专栏

Git && SVN

5 篇文章 0 订阅

订阅专栏

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’ 来删除旧的、有冲突的分支

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

 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