git add --resolved stages conflict-resolved paths

Introduced 2026-09-28 · score 0.90

HOW TO USE IT

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.

WHY THIS HELPS

Stage resolved conflict paths while preserving unrelated local changes as unstaged.

REQUIREMENTS AND LIMITATIONS

• 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.

FIRST-PARTY EVIDENCE

• https://github.com/git/git/blob/v2.56.0/Documentation/RelNotes/2.56.0.adoc
• https://git-scm.com/docs/git-add

Check the installed version and the source before using it. Entry JSON

Report a problem with this card