Git 2.56 ships git add --resolved that refuses to stage leftover conflict markers
0xkarasy · x · 2026-10-05
Git 2.56.0 is out, with contributions from 104 developers (39 new). GitHub's blog highlights the changes.
- New git add --resolved mode: purpose-built for the conflict-resolution step. It stages only paths still unmerged in the index and scans them for leftover conflict markers first — if any remain, it errors out and lists the files, leaving the index untouched, so you no longer accidentally commit unrelated edits or unresolved conflicts.
- Performance: one merge-base case dropped from 0.68s to 0.01s.
- Plus various other fixes; full details on the GitHub Blog.
More from coding & agent
- Antithesis to Present "Time-Traveling Agents" for Autonomous Testing at SPLASH/ISSTA 2026 — moarbugs · 2026-10-05
- A Plain-Language Guide to Evals: How to Tell If Your LLM System Actually Works — DrDatta_AIIMS · 2026-10-05
- Supermemory launches smfs: filesystem ergonomics for agent memory without the token tax — gaganghotra_ · 2026-10-05
- Claude Code spent 6 hours and 33% of a weekly quota making its own reply video — Vivid-Snow-2089 · 2026-10-05
- AI-Generated Match-3 x Flappy Hybrid Level: 5 Minutes and $0.77 to Build — Flomerboy · 2026-10-05
- Agent stuck in a loop cost $12 overnight and nearly $1,200 — how do you build kill switches? — Full_Collar9026 · 2026-10-05