這邊先提一下我的環境:
使用 OS 是 Windows 11
有安裝以下軟體:
- Git,版本是 git version 2.36.0.windows.1
- TortoiseGit v2.13.0
- VS Code
今天遇到的問題是,有些分支我要刪除時,跳出以下錯誤視窗
Could not delete reference
libgit2 returned: entry is not unique due to being a multivar
libgit2 returned: entry is not unique due to being a multivar
Git 專案狀況
經過檢查,在 git config 中,該分支長這樣
[branch "feature/TEST-1023"]
vscode-merge-base = origin/release
vscode-merge-base = origin/release
而一般分支可能會有這幾種狀況
[branch "feature/TEST-900"]
vscode-merge-base = origin/release
[branch "hotfix/TEST-910-Lorem-ipsum-dolor"]
[branch "hotfix/TEST-915"]
[branch "feature/TEST-923-Vestibulum-tortor-odio"]
remote = origin
merge = refs/heads/feature/TEST-923-Vestibulum-tortor-odio
解決方法
而出現問題的 feature/TEST-1023,只要把重複的 vscode-merge-base = origin/release 刪除掉,就可以正常刪除分支了。即:
[branch "feature/TEST-1023"]
vscode-merge-base = origin/release
或者把兩行 vscode-merge-base = origin/release 都刪除掉,也可以解決
不過,為什麼會發生這種狀況我實在不曉得
看這 config ,應該是因為 VS code導致的,但我不記得我有使用 VS code來合併分支啊……
沒有留言:
張貼留言