Git 2.56's git add --resolved only checks conflict markers while git still calls a file unmerged
7.1 relevance
Score Breakdown
technical depth 8
novelty 8
actionability 7
community 6
strategic 4
personal 7
Scored daily by a customisable AI persona to surface the most relevant engineering leadership news.
Testing Git 2.56's new add --resolved flag with edge cases, highly technical and actionable for version control workflows.
Summary
Git 2.56's `git add --resolved` flag stages only files git considers unmerged, ignoring unrelated working-tree changes, and refuses to stage paths containing leftover conflict markers. Testing revealed the marker check only applies to files git still tracks as unmerged (stage 1/2/3 entries); if `git reset` collapses those entries, the flag silently does nothing even if conflict markers remain. The flag is atomic—one bad file blocks the entire invocation, preventing partial staging of resolved paths.