{
  "id": "git/merge-conflict-during-rebase-continue",
  "signature": "error: could not apply <hash>... Commit message (rebase conflict)",
  "signature_zh": "错误：无法应用 <hash>... 提交消息（变基冲突）",
  "regex": "error: could not apply [0-9a-f]{7}\\.\\.\\. .+ \\(rebase conflict\\)",
  "domain": "git",
  "category": "runtime_error",
  "subcategory": null,
  "root_cause": "During a rebase operation, git cannot automatically apply a commit due to content conflicts that require manual resolution.",
  "root_cause_type": "generic",
  "root_cause_zh": "在变基操作期间，git 无法自动应用提交，因为内容冲突需要手动解决。",
  "versions": [
    {
      "version": "git 2.28",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    },
    {
      "version": "git 2.36",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    },
    {
      "version": "git 2.44",
      "introduced": null,
      "deprecated": null,
      "removed": null,
      "behavior_change": null,
      "status": "active"
    }
  ],
  "os_specific": {},
  "dead_ends": [
    {
      "action": "Run git rebase --skip without resolving conflicts",
      "why_fails": "Skips the problematic commit entirely, losing its changes; may lead to incomplete history.",
      "fail_rate": 0.7,
      "condition": "",
      "sources": []
    },
    {
      "action": "Edit the commit message to bypass the error",
      "why_fails": "Conflict is in content, not message; editing message does nothing.",
      "fail_rate": 1.0,
      "condition": "",
      "sources": []
    },
    {
      "action": "Use git rebase --abort and start over with a different base",
      "why_fails": "Aborts the entire rebase; user loses progress and must redo conflict resolution from scratch.",
      "fail_rate": 0.3,
      "condition": "",
      "sources": []
    }
  ],
  "workarounds": [
    {
      "action": "Resolve conflicts manually in the conflicting files, then git add <file>; git rebase --continue",
      "success_rate": 0.95,
      "how": "Resolve conflicts manually in the conflicting files, then git add <file>; git rebase --continue",
      "condition": "",
      "sources": []
    },
    {
      "action": "Use git mergetool to launch a graphical merge tool for easier conflict resolution",
      "success_rate": 0.85,
      "how": "Use git mergetool to launch a graphical merge tool for easier conflict resolution",
      "condition": "",
      "sources": []
    },
    {
      "action": "If the commit is not needed, use git rebase --skip to drop it, but verify no important changes are lost",
      "success_rate": 0.7,
      "how": "If the commit is not needed, use git rebase --skip to drop it, but verify no important changes are lost",
      "condition": "",
      "sources": []
    }
  ],
  "workarounds_zh": [
    "Resolve conflicts manually in the conflicting files, then git add <file>; git rebase --continue",
    "Use git mergetool to launch a graphical merge tool for easier conflict resolution",
    "If the commit is not needed, use git rebase --skip to drop it, but verify no important changes are lost"
  ],
  "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.85,
  "resolvable": "true",
  "first_seen": "2024-01-25",
  "last_confirmed": "2024-06-01",
  "last_updated": "2024-06-01",
  "evidence_count": 1,
  "tags": [],
  "locale": "en",
  "aliases": []
}