Git 2.56 makes conflict staging and merge-base walks safer
by Fla

Git 2.56 makes conflict staging and merge-base walks safer

Git 2.56 adds git add --resolved, which stages only paths involved in a merge conflict and refuses to proceed when selected files still contain conflict markers.

The release also improves merge-base traversal, with reported large speedups in some monorepo and Linux-kernel cases.

Path-walk repacks can now use reachability bitmaps and delta islands, removing two barriers to evaluating their storage savings on repository hosts.

Fla
Written by Fla
Follow
Add as a preferred source on Google
Git iconGit
  1142
  • ...

Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

No comments so far, maybe you want to be first?