git runtime_error ai_generated true

错误：分支 'feature-x' 未完全合并。如果您确定要删除它，请运行 'git branch -D feature-x'。

error: The branch 'feature-x' is not fully merged. If you are sure you want to delete it, run 'git branch -D feature-x'.

ID: git/error-branch-not-fully-merged

其他格式: JSON · Markdown 中文 · English
95%修复率
85%置信度
1证据数
2023-04-12首次发现

版本兼容性

版本状态引入弃用备注
git 1.7.0 active — — —
git 2.30.0 active — — —
git 2.45.0 active — — —

根因分析

尝试使用 git branch -d 删除一个分支，该分支包含从当前 HEAD 或其上游无法到达的提交，表明可能会丢失工作。

English

Attempting to delete a branch with git branch -d that has commits not reachable from the current HEAD or its upstream, indicating potential loss of work.

generic

官方文档

https://git-scm.com/docs/git-branch#Documentation/git-branch.txt--d

解决方案

  1. git branch -D feature-x  # Force delete the branch if you are certain its work is no longer needed
  2. git checkout feature-x && git log --oneline --not --remotes=origin  # Review unmerged commits, then merge or cherry-pick them to main before safe deletion with git branch -d

无效尝试

常见但无效的做法:

  1. 70% 失败

    Running git merge --squash on the branch before deleting does not actually merge the commits; it only creates a squash commit that doesn't preserve history, so the branch still appears unmerged.

  2. 50% 失败

    Using git branch -d after a git rebase that rewrites history may still fail because the original commits are no longer directly referenced, even if they are functionally merged.