Git 2.56 stages resolved conflicts without sweeping up unrelated edits

Git 2.56 introduces git add --resolved for the moment after you repair a merge conflict. It considers only unmerged paths and refuses to stage the selected files if any regular file still contains conflict markers. Unrelated local edits stay unstaged. This recently published release is worth revisiting if you maintain busy branches; marker detection still cannot prove the merged code is correct.

GitHub · Sep 28, 2026

Why it matters

A small command-line improvement reduces an easy mistake during conflicted merges.

More context

Try the mode after upgrading Git, optionally with a pathspec to narrow the selection. Its marker check is all-or-nothing for that selection; resolved deletions and binary conflicts can still be staged.

Keep in mind

Run the relevant tests after resolving a conflict; absence of textual markers is only a staging check.

Original read