# 错误：无法应用 <哈希>... <提交信息>（变基冲突）

- **ID:** `git/divergent-branch-rebase-conflict`
- **领域:** git
- **类别:** runtime_error
- **验证级别:** ai_generated
- **修复率:** 88%

## 根因

变基操作遇到了无法自动解决的合并冲突，因为当前分支和目标分支已经分叉，补丁无法干净地应用。

## 版本兼容性

| 版本 | 状态 | 引入 | 弃用 |
|------|------|------|------|
| git 2.39.0 | active | — | — |
| git 2.40.1 | active | — | — |
| git 2.41.0 | active | — | — |

## 解决方案

1. ```
   Manually edit the conflicted file to resolve conflict markers (<<<<<<<, =======, >>>>>>>), then run 'git add <file>' and 'git rebase --continue'
   ```
2. ```
   Use a mergetool like 'git mergetool' to visually resolve conflicts with KDiff3 or vimdiff, then continue the rebase
   ```
3. ```
   If the conflict is too complex, abort with 'git rebase --abort' and use 'git merge' instead, which may handle divergent histories more gracefully
   ```

## 无效尝试

- **** — Skipping the commit removes its changes permanently from the rebased branch, leading to data loss or incomplete integration. (65% 失败率)
- **** — Git will still detect unresolved conflicts because the conflict markers remain in the file, causing the rebase to abort or produce corrupted content. (80% 失败率)
- **** — This discards all uncommitted changes and the rebase state, but does not resolve the underlying divergence; the same conflict will reappear on next rebase attempt. (50% 失败率)