Git 2.56 makes conflict-resolution staging more precise
Git 2.56 adds git add --resolved for staging only the files whose conflicts have been resolved.
HEISE DEVELOPER — Unrelated modifications stay out of the index, reducing accidental inclusion during a merge. The option gives developers a more precise way to prepare a commit when a working tree contains several concurrent changes.
Readers’ Forum
No contributions yet — open the debate.
Open the discussion
No account or password needed — just enter your e-mail and we’ll send you a one-time sign-in link. First time here? You’re set up automatically.
Your rating will be applied automatically after you sign in.
Check your inbox
We’ve sent a sign-in link to …. Open it on this device — this tab will sign you in automatically.
Nothing arrived? Check your spam folder — and mark the mail as "Not spam" so it lands in your inbox next time.