{
  "slug": "git-add-resolved-stages-conflict-resolved-paths-d08a10585f5d",
  "title": "git add --resolved stages conflict-resolved paths",
  "tools": [
    "git"
  ],
  "tags": [
    "agent"
  ],
  "introduced_at": "2026-09-28T04:20:13.000Z",
  "announced_at": "2026-09-28T04:20:13.000Z",
  "effective_at": null,
  "date_basis": "source-publication",
  "status": "unknown",
  "how": {
    "incantation": "When conflict-resolved paths remain unmerged, run `git add --resolved` to stage them. It refuses to stage any files if an unmerged path still has conflict markers.",
    "examples": [
      "git add --resolved"
    ],
    "gotchas": [
      "Version: 2.56.0",
      "--resolved (required): Update the index for unmerged paths with no conflict markers. Cannot be combined with `-u` or `-A`.",
      "<pathspec>…: Limit the operation to matching unmerged paths.",
      "The command scans unmerged paths for leftover conflict markers and aborts if any are found."
    ]
  },
  "why_it_matters": "Stage resolved conflict paths while preserving unrelated local changes as unstaged.",
  "sources": [
    "https://github.com/git/git/blob/v2.56.0/Documentation/RelNotes/2.56.0.adoc",
    "https://git-scm.com/docs/git-add"
  ],
  "rank": 0.90035,
  "judge": {
    "publish": true,
    "judge_model": "codex-cli/gpt-6-luna+typesafe/jev-1.13.0",
    "prompt_version": "extract-v7+enrich-v2+judge-v2x3+jev-publish-v1"
  },
  "review_state": "approved",
  "provenance": {
    "run_id": "wave1b-tools-20261017",
    "verdict_id": "wave1b-tools-20261017:wave1b-tools-20261017-4115eb30c26fb34f-19:gate",
    "evidence_hash": "b99220a90a17750fbc88b495bd083e31c0cb52a974f550406f496a571c0b330d"
  },
  "review": {
    "draft_hash": "826a630f8c650e828577faa882aaf6924256cd23a5f6e382b0f6711dc4358609",
    "reviewer": "publication-gate",
    "reviewed_at": "2026-10-07T00:00:00.000Z",
    "decision": "wave1b-tools-20261017:gate",
    "reason": "2 of 3 judge runs approved with p_yes >= 0.9 (mean 0.90 >= 0.9; 2 needed) and Jev gave 0.61 (>= 0.6 needed)."
  }
}