Git 2.56 ships git add --resolved to stage only resolved conflict paths
DanielLockyer · x · 2026-09-30
Git 2.56.0 lands with contributions from 104+ developers (39 new). Headline feature: git add --resolved stages only unmerged paths and refuses to stage files that still contain conflict markers, fixing the footgun where git add -u sweeps in unrelated edits. The linked git branch --delete-merged also drew cheers.
More from coding & agent
- Magpie launches web UI with Docker images for server and WSL/SSH remote deployment — dotey · 2026-09-30
- ELY-GPUI: a new Rust GPUI component library ships with 1,272 components across 43 categories — mohamedmansour · 2026-09-30
- The hardest LLM mistakes to catch are the ones that look perfectly reasonable — Innowise_ · 2026-09-30
- Grok agent asks for its own email to run mail, PRs and Pinterest — prasenx · 2026-09-30
- VoxPolyMem: Interaction-aware multimodal memory for multi-party spoken conversations beats baseline by 23.6 points — Wenxu Jia · 2026-09-30
- Batching vLLM calls with shared prefixes: a warm-up-then-fan-out KV cache strategy — Theboyscampus · 2026-09-30