AI编程生活评测

git错误Your configuration specifies to merge with the ref xxxx

编程笔记 / 2023-04-14 / 1 min
在分支 master 执行 git pull 的时候,提示错误:
Your configuration specifies to merge with the ref 'refs/heads/release/v20230413.1'
from the remote, but no such ref was fetched.
这个是由于远端的分支已经不存在了,而本地这个分支还保持着跟踪。删除分支跟踪然后删除这个分支即可。
git checkout release/v20230413.1

# 提示
Already on 'release/v20230413.1'
Your branch is based on 'origin/release/v20230413.1', but the upstream is gone. 
(use "git branch --unset-upstream" to fixup)

# unset 掉分支跟踪
git branch --unset-upstream

# 这里就可以正常pull代码了
git checkout master
git pull

# 删除远端不存在的分支
git branch -d release/v20230413.1
至此就可以成功删除这个本地分支了。
  1. 灰常记忆 2023-04-23 · 23:29 回复

    git太难用了

    1. 行星带 2023-05-09 · 09:25 回复

      没有git的话,日子更没法过了,我还记得用svn的痛苦

点击刷新