{
  "id": "git/divergent-branch-rebase-conflict",
  "signature": "error: could not apply <hash>... <commit-message> (rebase conflict)",
  "signature_zh": "错误：无法应用 <哈希>... <提交信息>（变基冲突）",
  "regex": "error: could not apply [a-f0-9]+\\.\\.\\. .+ \\(rebase conflict\\)",
  "domain": "git",
  "category": "runtime_error",
  "subcategory": null,
  "root_cause": "A rebase operation encountered a merge conflict that cannot be automatically resolved because the current branch and the target branch have diverged, and the patch does not cleanly apply.",
  "root_cause_type": "generic",
  "root_cause_zh": "变基操作遇到了无法自动解决的合并冲突，因为当前分支和目标分支已经分叉，补丁无法干净地应用。",
  "versions": [
    {
      "version": "git 2.39.0",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    },
    {
      "version": "git 2.40.1",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    },
    {
      "version": "git 2.41.0",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    }
  ],
  "os_specific": {},
  "dead_ends": [
    {
      "action": "",
      "why_fails": "Skipping the commit removes its changes permanently from the rebased branch, leading to data loss or incomplete integration.",
      "fail_rate": 0.65,
      "condition": "",
      "sources": []
    },
    {
      "action": "",
      "why_fails": "Git will still detect unresolved conflicts because the conflict markers remain in the file, causing the rebase to abort or produce corrupted content.",
      "fail_rate": 0.8,
      "condition": "",
      "sources": []
    },
    {
      "action": "",
      "why_fails": "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.",
      "fail_rate": 0.5,
      "condition": "",
      "sources": []
    }
  ],
  "workarounds": [
    {
      "action": "Manually edit the conflicted file to resolve conflict markers (<<<<<<<, =======, >>>>>>>), then run 'git add <file>' and 'git rebase --continue'",
      "success_rate": 0.9,
      "how": "Manually edit the conflicted file to resolve conflict markers (<<<<<<<, =======, >>>>>>>), then run 'git add <file>' and 'git rebase --continue'",
      "condition": "",
      "sources": []
    },
    {
      "action": "Use a mergetool like 'git mergetool' to visually resolve conflicts with KDiff3 or vimdiff, then continue the rebase",
      "success_rate": 0.85,
      "how": "Use a mergetool like 'git mergetool' to visually resolve conflicts with KDiff3 or vimdiff, then continue the rebase",
      "condition": "",
      "sources": []
    },
    {
      "action": "If the conflict is too complex, abort with 'git rebase --abort' and use 'git merge' instead, which may handle divergent histories more gracefully",
      "success_rate": 0.7,
      "how": "If the conflict is too complex, abort with 'git rebase --abort' and use 'git merge' instead, which may handle divergent histories more gracefully",
      "condition": "",
      "sources": []
    }
  ],
  "workarounds_zh": [
    "Manually edit the conflicted file to resolve conflict markers (<<<<<<<, =======, >>>>>>>), then run 'git add <file>' and 'git rebase --continue'",
    "Use a mergetool like 'git mergetool' to visually resolve conflicts with KDiff3 or vimdiff, then continue the rebase",
    "If the conflict is too complex, abort with 'git rebase --abort' and use 'git merge' instead, which may handle divergent histories more gracefully"
  ],
  "transition_graph": {
    "leads_to": [],
    "preceded_by": [],
    "frequently_confused_with": []
  },
  "official_doc_url": "https://git-scm.com/docs/git-rebase#_conflict_resolution",
  "official_doc_section": null,
  "error_code": null,
  "verification_tier": "ai_generated",
  "confidence": 0.85,
  "fix_success_rate": 0.88,
  "resolvable": "true",
  "first_seen": "2024-03-15",
  "last_confirmed": "2024-06-01",
  "last_updated": "2024-06-01",
  "evidence_count": 1,
  "tags": [],
  "locale": "en",
  "aliases": []
}