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

- **ID:** `git/merge-conflict-during-rebase-continue`
- **领域:** git
- **类别:** runtime_error
- **验证级别:** ai_generated
- **修复率:** 85%

## 根因

在变基操作期间，git 无法自动应用提交，因为内容冲突需要手动解决。

## 版本兼容性

| 版本 | 状态 | 引入 | 弃用 |
|------|------|------|------|
| git 2.28 | active | — | — |
| git 2.36 | active | — | — |
| git 2.44 | active | — | — |

## 解决方案

1. ```
   Resolve conflicts manually in the conflicting files, then git add <file>; git rebase --continue
   ```
2. ```
   Use git mergetool to launch a graphical merge tool for easier conflict resolution
   ```
3. ```
   If the commit is not needed, use git rebase --skip to drop it, but verify no important changes are lost
   ```

## 无效尝试

- **Run git rebase --skip without resolving conflicts** — Skips the problematic commit entirely, losing its changes; may lead to incomplete history. (70% 失败率)
- **Edit the commit message to bypass the error** — Conflict is in content, not message; editing message does nothing. (100% 失败率)
- **Use git rebase --abort and start over with a different base** — Aborts the entire rebase; user loses progress and must redo conflict resolution from scratch. (30% 失败率)